]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:39:11 +0000 (12:39 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 4 Dec 2013 10:39:11 +0000 (12:39 +0200)

Trivial merge