]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Wed, 3 Apr 2013 18:30:31 +0000 (20:30 +0200)
committerNikita Popov <nikic@php.net>
Wed, 3 Apr 2013 18:30:31 +0000 (20:30 +0200)

Trivial merge