Merge "MWCryptHKDFTest: Mock $wgSecretKey to ensure atomicity"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 7 Oct 2014 06:45:08 +0000 (06:45 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 7 Oct 2014 06:45:08 +0000 (06:45 +0000)

Trivial merge