]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Thu, 28 Mar 2013 17:41:34 +0000 (18:41 +0100)
committerNikita Popov <nikic@php.net>
Thu, 28 Mar 2013 17:41:34 +0000 (18:41 +0100)

Trivial merge