Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Fri, 27 Feb 2015 22:24:02 +0000 (23:24 +0100)
committerNikita Popov <nikic@php.net>
Fri, 27 Feb 2015 22:24:02 +0000 (23:24 +0100)

Trivial merge