]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.5'
authorNikita Popov <nikic@php.net>
Sun, 29 Sep 2013 16:01:42 +0000 (18:01 +0200)
committerNikita Popov <nikic@php.net>
Sun, 29 Sep 2013 16:01:42 +0000 (18:01 +0200)

Trivial merge