]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorDerick Rethans <github@derickrethans.nl>
Wed, 15 Jun 2016 17:30:03 +0000 (18:30 +0100)
committerDerick Rethans <github@derickrethans.nl>
Wed, 15 Jun 2016 17:30:03 +0000 (18:30 +0100)

Trivial merge