]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 3 Oct 2014 19:42:35 +0000 (21:42 +0200)
committerNikita Popov <nikic@php.net>
Fri, 3 Oct 2014 19:42:35 +0000 (21:42 +0200)

Trivial merge