]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorBob Weinand <bobwei9@hotmail.com>
Wed, 23 Sep 2015 16:30:44 +0000 (18:30 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Wed, 23 Sep 2015 16:30:44 +0000 (18:30 +0200)

Trivial merge