Merge "Make sure we always restore the error handler."
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 15 Nov 2013 18:29:06 +0000 (18:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 15 Nov 2013 18:29:06 +0000 (18:29 +0000)

Trivial merge