]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5' into PHP-5.6
authorNikita Popov <nikic@php.net>
Fri, 29 Nov 2013 22:31:13 +0000 (23:31 +0100)
committerNikita Popov <nikic@php.net>
Fri, 29 Nov 2013 22:31:13 +0000 (23:31 +0100)

Trivial merge