]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 2 May 2014 10:52:44 +0000 (12:52 +0200)
committerNikita Popov <nikic@php.net>
Fri, 2 May 2014 10:52:44 +0000 (12:52 +0200)

Trivial merge