]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: db960e8 03c703b)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)
committerStanislav Malyshev <stas@php.net>
Fri, 25 Apr 2014 06:59:32 +0000 (23:59 -0700)
* PHP-5.4:
  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.