Merge "Remove $wgDBClusterTimeout"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 12 Jun 2014 20:46:59 +0000 (20:46 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 12 Jun 2014 20:46:59 +0000 (20:46 +0000)

Trivial merge