]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Sun, 1 Dec 2013 12:48:09 +0000 (13:48 +0100)
committerNikita Popov <nikic@php.net>
Sun, 1 Dec 2013 12:48:09 +0000 (13:48 +0100)

Trivial merge