Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  update NEWS
  updated NEWS
  Fixed bug #64342 ZipArchive::addFile() has to check for file existence
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
apply change from opcache readme to php.ini
Merge branch 'PHP-5.5'

* PHP-5.5:
  apply change from opcache readme to php.ini
Merge branch 'PHP-5.4' into PHP-5.5

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

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