]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@schlueters.de>
Thu, 29 Mar 2012 08:57:57 +0000 (10:57 +0200)
committerJohannes Schlüter <johannes@schlueters.de>
Thu, 29 Mar 2012 08:57:57 +0000 (10:57 +0200)
* PHP-5.3:


Trivial merge