]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Tue, 21 May 2013 11:28:09 +0000 (13:28 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 21 May 2013 11:28:09 +0000 (13:28 +0200)

Trivial merge