]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aa84d90 1cc5d10)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Tue, 18 Feb 2014 16:48:52 +0000 (08:48 -0800)
committerStanislav Malyshev <stas@php.net>
Tue, 18 Feb 2014 16:48:52 +0000 (08:48 -0800)
* PHP-5.5:
  update news with CVE
  5.5.11-dev next
  5.5.11 next for NEWS

Conflicts:
configure.in
main/php_version.h


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