Merge "Removed deprecated $wgMasterWaitTimeout; not used by LoadBalancer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 27 Aug 2015 00:09:50 +0000 (00:09 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 27 Aug 2015 00:09:50 +0000 (00:09 +0000)

Trivial merge