]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6008ac8 540a5a5)
Merge branch 'PHP-5.5' of git.php.net:php-src into PHP-5.5
authorDmitry Stogov <dmitry@zend.com>
Tue, 28 May 2013 20:02:37 +0000 (00:02 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 28 May 2013 20:02:37 +0000 (00:02 +0400)
* 'PHP-5.5' of git.php.net:php-src:
  Fix #64745 hash_pbkdf2 truncation issue


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