]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 784b4cd fef691b)
Merge branch 'PHP-5.4'
authorStanislav Malyshev <stas@php.net>
Wed, 13 Jun 2012 19:25:04 +0000 (12:25 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 13 Jun 2012 19:26:14 +0000 (12:26 -0700)
Merge reverts from 5.4, but shouldn't actually revert anything
* PHP-5.4:
  Merge PHP 5.3.14 NEWS
  re-add 61755 to NEWS
  re-add 61755 to NEWS
  Revert "Add PBKDF2 support via openssl()"
  Revert "Rename openssl_pkcs5_pbkdf2_hmac() to something that doesn't sound like a spell."
  add CVE


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