Merge "Special:Lockdb return error when database is locked."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 7 May 2016 19:55:19 +0000 (19:55 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 7 May 2016 19:55:19 +0000 (19:55 +0000)

Trivial merge