]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Wed, 30 Jan 2013 19:42:30 +0000 (20:42 +0100)
committerNikita Popov <nikic@php.net>
Wed, 30 Jan 2013 19:42:30 +0000 (20:42 +0100)

Trivial merge