diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-01-24 16:07:29 +0100 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-01-24 16:07:29 +0100 |
commit | 69af35718253b3d106074b7133f8c74322468674 (patch) | |
tree | aaad45f5ad214dd7a7f5be7fd9dda84d1996619c /ext/zip/php_zip.h | |
parent | c4c10a222e4358b1d9d28ef852e8a5d56709865d (diff) | |
parent | 4b48b299885bf0e2f2c72902b072c28f255e8f68 (diff) | |
download | php-git-69af35718253b3d106074b7133f8c74322468674.tar.gz |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
fix the primary qa email address and update the list of available people being able to add moderators to our lists
Revert "Fix #62479: Some chars not parsed in passwords"
Fix #62479: Some chars not parsed in passwords
Diffstat (limited to 'ext/zip/php_zip.h')
0 files changed, 0 insertions, 0 deletions