]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Tue, 20 Oct 2015 19:56:20 +0000 (21:56 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Tue, 20 Oct 2015 19:56:20 +0000 (21:56 +0200)

Trivial merge