]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Sun, 24 Mar 2013 15:09:59 +0000 (16:09 +0100)
committerNikita Popov <nikic@php.net>
Sun, 24 Mar 2013 15:09:59 +0000 (16:09 +0100)

Trivial merge