Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
Upgrade crypt_blowfish to version 1.3
Add tests from 1.3. Add missing tests.

3 of the missing tests fail. // TODO
Bug fixes in light of failing bcrypt tests
Apply error-code-salt fix to Windows too
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Upgrade crypt_blowfish to version 1.3
Add tests from 1.3. Add missing tests.

3 of the missing tests fail. // TODO
Bug fixes in light of failing bcrypt tests

Conflicts:
	ext/standard/crypt.c
Apply error-code-salt fix to Windows too

Conflicts:
	ext/standard/crypt.c
Merge branch 'pull-request/868' into PHP-5.5

* pull-request/868:
  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
update NEWS
update news
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
update news
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  update news

Conflicts:
	ext/standard/crypt.c
Merge branch 'PHP-5.5' into PHP-5.6

* PHP-5.5:
  update news
  update news
  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
  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
Merge branch 'PHP-5.6'

* PHP-5.6:
  update news
  update news
  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
  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

Conflicts:
	ext/standard/crypt.c
fix ZTS
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)