]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorDerick Rethans <github@derickrethans.nl>
Sun, 26 Oct 2014 14:54:09 +0000 (10:54 -0400)
committerDerick Rethans <github@derickrethans.nl>
Sun, 26 Oct 2014 14:54:09 +0000 (10:54 -0400)

Trivial merge