]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Thu, 22 Aug 2013 12:07:32 +0000 (14:07 +0200)
committerNikita Popov <nikic@php.net>
Thu, 22 Aug 2013 12:07:32 +0000 (14:07 +0200)

Trivial merge