]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Mon, 5 Oct 2015 12:50:52 +0000 (14:50 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Mon, 5 Oct 2015 12:50:52 +0000 (14:50 +0200)
Previous commit was a merge to the wrong branch... Cherry-Picked into PHP-7.0 and empty merge here


Trivial merge