]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Fri, 23 Aug 2013 11:30:46 +0000 (13:30 +0200)
committerNikita Popov <nikic@php.net>
Fri, 23 Aug 2013 11:30:46 +0000 (13:30 +0200)

Trivial merge