]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Mon, 18 Aug 2014 19:27:51 +0000 (20:27 +0100)
committerDerick Rethans <github@derickrethans.nl>
Mon, 18 Aug 2014 19:27:51 +0000 (20:27 +0100)

Trivial merge