]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Sat, 25 Jan 2014 15:16:34 +0000 (16:16 +0100)
committerDerick Rethans <github@derickrethans.nl>
Sat, 25 Jan 2014 15:16:34 +0000 (16:16 +0100)

Trivial merge