Merge branch 'PHP-5.3' into PHP-5.4
authorJohannes Schlüter <johannes@php.net>
Wed, 22 May 2013 15:15:27 +0000 (17:15 +0200)
committerJohannes Schlüter <johannes@php.net>
Wed, 22 May 2013 15:15:27 +0000 (17:15 +0200)

Trivial merge