]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorDerick Rethans <github@derickrethans.nl>
Wed, 18 May 2016 11:19:49 +0000 (12:19 +0100)
committerDerick Rethans <github@derickrethans.nl>
Wed, 18 May 2016 11:19:49 +0000 (12:19 +0100)

Trivial merge