Merge branch 'PHP-5.4' into PHP-5.5
authorJohannes Schlüter <johannes@php.net>
Thu, 20 Jun 2013 09:57:10 +0000 (11:57 +0200)
committerJohannes Schlüter <johannes@php.net>
Thu, 20 Jun 2013 09:57:10 +0000 (11:57 +0200)

Trivial merge