]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Thu, 7 Feb 2013 15:24:44 +0000 (16:24 +0100)
committerAndrey Hristov <andrey@php.net>
Thu, 7 Feb 2013 15:24:44 +0000 (16:24 +0100)

Trivial merge