]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Sat, 24 Nov 2012 18:24:40 +0000 (19:24 +0100)
committerNikita Popov <nikic@php.net>
Sat, 24 Nov 2012 18:24:40 +0000 (19:24 +0100)

Trivial merge