Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
lucky that the name is not used, fix name of encoder
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  lucky that the name is not used, fix name of encoder