]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Thu, 29 Oct 2015 19:14:25 +0000 (19:14 +0000)
committerJakub Zelenka <bukka@php.net>
Thu, 29 Oct 2015 19:14:25 +0000 (19:14 +0000)

Trivial merge