]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorBob Weinand <bobwei9@hotmail.com>
Sat, 3 Dec 2016 22:42:29 +0000 (23:42 +0100)
committerBob Weinand <bobwei9@hotmail.com>
Sat, 3 Dec 2016 22:44:23 +0000 (23:44 +0100)

Trivial merge