]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Thu, 12 Sep 2013 13:15:17 +0000 (15:15 +0200)
committerNikita Popov <nikic@php.net>
Thu, 12 Sep 2013 13:15:17 +0000 (15:15 +0200)

Trivial merge