Merge branch 'PHP-5.3' into PHP-5.4
authorAndrey Hristov <andrey@php.net>
Thu, 8 Aug 2013 12:03:00 +0000 (14:03 +0200)
committerAndrey Hristov <andrey@php.net>
Thu, 8 Aug 2013 12:03:00 +0000 (14:03 +0200)

Trivial merge