Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorGeorge Wang <gwang@php.net>
Wed, 3 Sep 2014 15:28:30 +0000 (11:28 -0400)
committerGeorge Wang <gwang@php.net>
Wed, 3 Sep 2014 15:28:30 +0000 (11:28 -0400)

Trivial merge