]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 21 Mar 2014 00:34:46 +0000 (01:34 +0100)
committerNikita Popov <nikic@php.net>
Fri, 21 Mar 2014 00:34:46 +0000 (01:34 +0100)

Trivial merge