]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Wed, 2 Jul 2014 15:37:25 +0000 (17:37 +0200)
committerNikita Popov <nikic@php.net>
Wed, 2 Jul 2014 15:37:25 +0000 (17:37 +0200)

Trivial merge