Merge "Use local context to get messages and don't use implicit Message object to...
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 6 Jun 2012 17:29:33 +0000 (17:29 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 6 Jun 2012 17:29:33 +0000 (17:29 +0000)

Trivial merge