]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Thu, 16 Jun 2016 19:11:54 +0000 (20:11 +0100)
committerJakub Zelenka <bukka@php.net>
Thu, 16 Jun 2016 19:11:54 +0000 (20:11 +0100)

Trivial merge