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

Trivial merge