]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorDerick Rethans <github@derickrethans.nl>
Mon, 2 Apr 2012 09:40:02 +0000 (10:40 +0100)
committerDerick Rethans <github@derickrethans.nl>
Mon, 2 Apr 2012 09:40:02 +0000 (10:40 +0100)

Trivial merge