]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Sun, 9 Feb 2014 20:57:43 +0000 (15:57 -0500)
committerDerick Rethans <github@derickrethans.nl>
Sun, 9 Feb 2014 20:57:43 +0000 (15:57 -0500)

Trivial merge