From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Tue, 29 Jul 2014 20:20:15 +0000 (+0000)
Subject: Merge "Added explicit type-cast to hash_pbkdf2"
X-Git-Tag: 1.31.0-rc.0~14686
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=8d467827e34b9091f6bec98c108af105d2de050e;p=lhc%2Fweb%2Fwiklou.git

Merge "Added explicit type-cast to hash_pbkdf2"
---

8d467827e34b9091f6bec98c108af105d2de050e