]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Wed, 26 Mar 2014 12:27:25 +0000 (14:27 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 26 Mar 2014 12:27:25 +0000 (14:27 +0200)

Trivial merge