]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Wed, 19 Dec 2012 14:23:52 +0000 (15:23 +0100)
committerNikita Popov <nikic@php.net>
Wed, 19 Dec 2012 14:23:52 +0000 (15:23 +0100)

Trivial merge