]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 6 Jun 2014 15:13:08 +0000 (17:13 +0200)
committerNikita Popov <nikic@php.net>
Fri, 6 Jun 2014 15:13:08 +0000 (17:13 +0200)

Trivial merge