]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorPierrick Charron <pierrick@php.net>
Wed, 26 Dec 2012 15:17:37 +0000 (10:17 -0500)
committerPierrick Charron <pierrick@php.net>
Wed, 26 Dec 2012 15:17:37 +0000 (10:17 -0500)

Trivial merge