]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 093ff4b 1bc16fb)
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)
* PHP-5.4:
  fix CVE ref for bug #66060
  5.4.26 next
  fix news

Conflicts:
configure.in
main/php_version.h


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.