]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.1' (-s ours)
authorBob Weinand <bobwei9@hotmail.com>
Thu, 13 Oct 2016 08:42:05 +0000 (10:42 +0200)
committerBob Weinand <bobwei9@hotmail.com>
Thu, 13 Oct 2016 08:42:05 +0000 (10:42 +0200)

Trivial merge