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

Trivial merge