From: Stanislav Malyshev <stas@php.net>
Date: Mon, 1 Dec 2014 05:12:17 +0000 (-0800)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: PRE_NATIVE_TLS_MERGE~101^2^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3003793480f762f3f31d10f97ce89fa1cb113fab;p=php

Merge branch 'PHP-5.4' into PHP-5.5

* 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
---

3003793480f762f3f31d10f97ce89fa1cb113fab