]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorDerick Rethans <github@derickrethans.nl>
Fri, 30 Sep 2016 19:49:53 +0000 (20:49 +0100)
committerDerick Rethans <github@derickrethans.nl>
Fri, 30 Sep 2016 19:49:53 +0000 (20:49 +0100)

Trivial merge