]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 21 Nov 2012 20:09:57 +0000 (21:09 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 21 Nov 2012 20:09:57 +0000 (21:09 +0100)

Trivial merge