diff options
| author | Stanislav Malyshev <stas@php.net> | 2014-01-21 13:28:03 -0800 |
|---|---|---|
| committer | Stanislav Malyshev <stas@php.net> | 2014-01-21 13:28:03 -0800 |
| commit | eb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0 (patch) | |
| tree | a79b6b3a2140173684fe7450d860806ffc52e832 | |
| parent | 093ff4b62463958f32576e95b90587fad17db042 (diff) | |
| parent | 1bc16fbfcdba428d42bc6d1d5cd84ad88a601c21 (diff) | |
| download | php-git-eb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
fix CVE ref for bug #66060
5.4.26 next
fix news
Conflicts:
configure.in
main/php_version.h
0 files changed, 0 insertions, 0 deletions