]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Mon, 6 Apr 2015 19:45:20 +0000 (21:45 +0200)
committerNikita Popov <nikic@php.net>
Mon, 6 Apr 2015 19:45:42 +0000 (21:45 +0200)

Trivial merge