Merge "Catch excpt to avoid fatal in Message::__toString"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Tue, 8 Jan 2013 17:32:14 +0000 (17:32 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Tue, 8 Jan 2013 17:32:14 +0000 (17:32 +0000)

Trivial merge