]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorNikita Popov <nikic@php.net>
Wed, 2 Jul 2014 20:40:33 +0000 (22:40 +0200)
committerNikita Popov <nikic@php.net>
Wed, 2 Jul 2014 20:40:33 +0000 (22:40 +0200)

Trivial merge