Merge "ApiOptionsTest: Simplify hook restoration"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 1 Jul 2014 17:26:52 +0000 (17:26 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 1 Jul 2014 17:26:52 +0000 (17:26 +0000)

Trivial merge