]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJakub Zelenka <bukka@php.net>
Sun, 20 Sep 2015 12:02:37 +0000 (13:02 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 20 Sep 2015 12:02:37 +0000 (13:02 +0100)

Trivial merge