]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Tue, 25 Mar 2014 12:17:19 +0000 (12:17 +0000)
committerDerick Rethans <github@derickrethans.nl>
Tue, 25 Mar 2014 12:17:19 +0000 (12:17 +0000)

Trivial merge