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

Trivial merge