Merge "Revert "Temporarily remove tests added in I8eef5a165""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Mon, 7 Apr 2014 13:18:30 +0000 (13:18 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Mon, 7 Apr 2014 13:18:30 +0000 (13:18 +0000)

Trivial merge