Merge "Fix bootstrap in unit tests"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 8 May 2013 12:35:08 +0000 (12:35 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 8 May 2013 12:35:08 +0000 (12:35 +0000)

Trivial merge