Merge "DerivativeContext::setConfig should take a Config object"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 27 May 2014 04:23:35 +0000 (04:23 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 27 May 2014 04:23:35 +0000 (04:23 +0000)

Trivial merge