]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorRasmus Lerdorf <rasmus@php.net>
Fri, 14 Dec 2012 00:15:06 +0000 (16:15 -0800)
committerRasmus Lerdorf <rasmus@php.net>
Fri, 14 Dec 2012 00:15:06 +0000 (16:15 -0800)

Trivial merge