]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Mon, 2 Dec 2013 19:11:34 +0000 (20:11 +0100)
committerNikita Popov <nikic@php.net>
Mon, 2 Dec 2013 19:11:34 +0000 (20:11 +0100)

Trivial merge