Merge branch 'PHP-5.6'
authorNikita Popov <nikic@php.net>
Sat, 30 Nov 2013 12:41:22 +0000 (13:41 +0100)
committerNikita Popov <nikic@php.net>
Sat, 30 Nov 2013 12:41:22 +0000 (13:41 +0100)

Trivial merge