Merge "Added explicit type-cast to hash_pbkdf2"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 29 Jul 2014 20:20:15 +0000 (20:20 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 29 Jul 2014 20:20:15 +0000 (20:20 +0000)

Trivial merge