]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Fri, 2 Oct 2015 10:51:45 +0000 (12:51 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Fri, 2 Oct 2015 10:51:45 +0000 (12:51 +0200)

Trivial merge