]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Fri, 8 Feb 2013 16:06:05 +0000 (17:06 +0100)
committerAndrey Hristov <andrey@php.net>
Fri, 8 Feb 2013 16:06:05 +0000 (17:06 +0100)

Trivial merge