]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Mon, 9 Nov 2015 18:23:29 +0000 (18:23 +0000)
committerJakub Zelenka <bukka@php.net>
Mon, 9 Nov 2015 18:23:29 +0000 (18:23 +0000)

Trivial merge