]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Sat, 9 Mar 2013 19:22:29 +0000 (20:22 +0100)
committerNikita Popov <nikic@php.net>
Sat, 9 Mar 2013 19:22:29 +0000 (20:22 +0100)

Trivial merge