]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4'
authorNikita Popov <nikic@php.net>
Mon, 13 Aug 2012 20:06:43 +0000 (22:06 +0200)
committerNikita Popov <nikic@php.net>
Mon, 13 Aug 2012 20:06:43 +0000 (22:06 +0200)

Trivial merge