]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Thu, 13 Aug 2015 10:07:39 +0000 (11:07 +0100)
committerDerick Rethans <github@derickrethans.nl>
Thu, 13 Aug 2015 10:07:39 +0000 (11:07 +0100)

Trivial merge