From: Dmitry Stogov <dmitry@zend.com>
Date: Tue, 28 May 2013 20:02:37 +0000 (+0400)
Subject: Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
X-Git-Tag: php-5.5.0RC3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ad90e90d904842cf95684111dececce311b8ef7d;p=php

Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5

* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue
---

ad90e90d904842cf95684111dececce311b8ef7d