]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorFerenc Kovacs <tyra3l@gmail.com>
Thu, 8 Dec 2016 06:09:41 +0000 (07:09 +0100)
committerFerenc Kovacs <tyra3l@gmail.com>
Thu, 8 Dec 2016 06:09:41 +0000 (07:09 +0100)

Trivial merge