]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Sat, 29 Jun 2013 19:57:36 +0000 (21:57 +0200)
committerNikita Popov <nikic@php.net>
Sat, 29 Jun 2013 19:57:36 +0000 (21:57 +0200)

Trivial merge