]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Mon, 17 Mar 2014 21:32:45 +0000 (22:32 +0100)
committerNikita Popov <nikic@php.net>
Mon, 17 Mar 2014 21:32:45 +0000 (22:32 +0100)

Trivial merge