From: Stanislav Malyshev <stas@php.net>
Date: Wed, 13 Jun 2012 19:25:04 +0000 (-0700)
Subject: Merge branch 'PHP-5.4'
X-Git-Tag: php-5.5.0alpha1~91^2~47
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74916d8ec86f10cf5efd91559e956da191dfe3e7;p=php

Merge branch 'PHP-5.4'

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

74916d8ec86f10cf5efd91559e956da191dfe3e7