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

Trivial merge