]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c34146 81098de)
Merge branch 'PHP-5.5' into PHP-5.6
authorStanislav Malyshev <stas@php.net>
Fri, 25 Apr 2014 07:00:20 +0000 (00:00 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 25 Apr 2014 07:00:20 +0000 (00:00 -0700)
* PHP-5.5:
  update NEWS
  add a test case previously broken by a bad fix
  Revert "Fixed bug #64604"


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