diff options
author | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 14:10:38 +0200 |
---|---|---|
committer | Ferenc Kovacs <tyrael@php.net> | 2014-10-15 14:10:38 +0200 |
commit | c32614370f1c819e5f2bb632912b4fcc6092cbfb (patch) | |
tree | ad52723275fb58862d5faffacdd25875039eef90 /Zend/tests | |
parent | 52b93004d070ff59a1ed6dcd91c8b08935fc1c04 (diff) | |
parent | 646b4cca854b0b5fefedbcffa9e6f7ea8149b087 (diff) | |
download | php-git-c32614370f1c819e5f2bb632912b4fcc6092cbfb.tar.gz |
Merge branch 'PHP-5.6'
* PHP-5.6:
PHP-5.6.3 is next
update NEWS, 5.6.2 will be a security-only release
Conflicts:
configure.in
main/php_version.h
Diffstat (limited to 'Zend/tests')
0 files changed, 0 insertions, 0 deletions