Merge "Split doc for $wgHKDFSecret/$wgHKDFAlgorithm in DefaultSettings.php"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 4 Nov 2014 05:18:44 +0000 (05:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 4 Nov 2014 05:18:44 +0000 (05:18 +0000)

Trivial merge