]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorJakub Zelenka <bukka@php.net>
Sun, 6 Nov 2016 20:43:50 +0000 (20:43 +0000)
committerJakub Zelenka <bukka@php.net>
Sun, 6 Nov 2016 20:43:50 +0000 (20:43 +0000)

Trivial merge