]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.3' into PHP-5.4
authorNikita Popov <nikic@php.net>
Tue, 14 Aug 2012 15:37:10 +0000 (17:37 +0200)
committerNikita Popov <nikic@php.net>
Tue, 14 Aug 2012 15:37:10 +0000 (17:37 +0200)

Trivial merge