]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)
committerDerick Rethans <github@derickrethans.nl>
Wed, 27 Nov 2013 22:01:09 +0000 (22:01 +0000)

Trivial merge