]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Tue, 21 Jan 2014 21:28:03 +0000 (13:28 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 21 Jan 2014 21:28:03 +0000 (13:28 -0800)
commiteb6d1fcd3c592aba0a6fe8527dc3621fbf521aa0
treea79b6b3a2140173684fe7450d860806ffc52e832
parent093ff4b62463958f32576e95b90587fad17db042
parent1bc16fbfcdba428d42bc6d1d5cd84ad88a601c21
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