Merge "Move the "shit" out"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 14 Oct 2015 07:40:50 +0000 (07:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 14 Oct 2015 07:40:50 +0000 (07:40 +0000)

Trivial merge