Merge "Documentation: Update $wgPasswordDefault and BcryptPassword"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 29 Jul 2014 15:11:04 +0000 (15:11 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 29 Jul 2014 15:11:04 +0000 (15:11 +0000)

Trivial merge