remove "PHP 6" staff
Merge branch 'PHP-5.4' of git.php.net:php-src into PHP-5.4
Merge branch 'PHP-5.4' into PHP-5.5
Merge branch 'PHP-5.5'
Fix English here
Fixed coredump due to abnormal implemention of phar
Merge branch 'PHP-5.5'
Merge branch 'master' of git.php.net:php-src
Sync ext/zip with pecl/zip version 1.3.2
- update libzip to version 1.11.1. We don't use any private symbol anymore
- new method ZipArchive::setPassword($password)
- add --with-libzip option to build with system libzip
NEWS + UPGRADING
Merge branch 'master' of git.php.net:php-src

# By Remi Collet (2) and Xinchen Hui (2)
# Via Xinchen Hui (5) and Remi Collet (1)
* 'master' of git.php.net:php-src:
  NEWS + UPGRADING
  Sync ext/zip with pecl/zip version 1.3.2 - update libzip to version 1.11.1. We don't use any private symbol anymore - new method ZipArchive::setPassword($password) - add --with-libzip option to build with system libzip
  Fixed coredump due to abnormal implemention of phar
  remove "PHP 6" staff