]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorJakub Zelenka <bukka@php.net>
Sun, 12 Jun 2016 17:40:24 +0000 (18:40 +0100)
committerJakub Zelenka <bukka@php.net>
Sun, 12 Jun 2016 17:40:24 +0000 (18:40 +0100)

Trivial merge