Merge "Fixed broken exception code"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 3 Jul 2014 23:59:11 +0000 (23:59 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 3 Jul 2014 23:59:11 +0000 (23:59 +0000)

Trivial merge