]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorDerick Rethans <github@derickrethans.nl>
Fri, 29 Jan 2016 14:34:47 +0000 (15:34 +0100)
committerDerick Rethans <github@derickrethans.nl>
Fri, 29 Jan 2016 14:34:47 +0000 (15:34 +0100)

Trivial merge