]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 17:37:43 +0000 (19:37 +0200)
committerAndrey Hristov <andrey@php.net>
Tue, 26 Nov 2013 17:37:43 +0000 (19:37 +0200)

Trivial merge