]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 29 Nov 2013 22:32:14 +0000 (23:32 +0100)
committerNikita Popov <nikic@php.net>
Fri, 29 Nov 2013 22:32:14 +0000 (23:32 +0100)

Trivial merge