]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Thu, 30 Aug 2012 20:30:37 +0000 (22:30 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 30 Aug 2012 20:30:37 +0000 (22:30 +0200)

Trivial merge