]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4d162a2 39007e2)
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:12:17 +0000 (21:12 -0800)
committerStanislav Malyshev <stas@php.net>
Mon, 1 Dec 2014 05:12:17 +0000 (21:12 -0800)
* PHP-5.4:
  update news
  Apply error-code-salt fix to Windows too
  Bug fixes in light of failing bcrypt tests
  Add tests from 1.3. Add missing tests.
  Upgrade crypt_blowfish to version 1.3


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