Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Wed, 21 Nov 2012 20:11:27 +0000 (21:11 +0100)
committerJohannes Schlüter <johannes@php.net>
Wed, 21 Nov 2012 20:11:27 +0000 (21:11 +0100)

Trivial merge