]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Wed, 5 Jul 2017 22:12:05 +0000 (00:12 +0200)
committerFerenc Kovacs <tyra3l@gmail.com>
Wed, 5 Jul 2017 22:12:05 +0000 (00:12 +0200)

Trivial merge