Merge "Handle CDB errors more gracefully in cdb.php maintenance script"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 22 Nov 2013 00:40:33 +0000 (00:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 22 Nov 2013 00:40:33 +0000 (00:40 +0000)

Trivial merge