Merge branch 'PHP-5.6'
authorJohannes Schlüter <johannes@php.net>
Sat, 15 Feb 2014 19:06:15 +0000 (20:06 +0100)
committerJohannes Schlüter <johannes@php.net>
Sat, 15 Feb 2014 19:06:15 +0000 (20:06 +0100)

Trivial merge