]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Mon, 30 Dec 2013 13:41:45 +0000 (14:41 +0100)
committerNikita Popov <nikic@php.net>
Mon, 30 Dec 2013 13:41:45 +0000 (14:41 +0100)

Trivial merge