Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorAndrey Hristov <andrey@php.net>
Wed, 26 Mar 2014 11:57:13 +0000 (13:57 +0200)
committerAndrey Hristov <andrey@php.net>
Wed, 26 Mar 2014 11:57:13 +0000 (13:57 +0200)

Trivial merge