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

Trivial merge