]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorDerick Rethans <github@derickrethans.nl>
Sat, 4 Oct 2014 15:00:29 +0000 (16:00 +0100)
committerDerick Rethans <github@derickrethans.nl>
Sat, 4 Oct 2014 15:00:29 +0000 (16:00 +0100)

Trivial merge