]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Tue, 11 Nov 2014 17:01:26 +0000 (14:01 -0300)
committerDerick Rethans <github@derickrethans.nl>
Tue, 11 Nov 2014 17:01:26 +0000 (14:01 -0300)

Trivial merge