Merge "Use local context instead of hidden dependencies on global variables."
authorSiebrand <s.mazeland@xs4all.nl>
Thu, 14 Jun 2012 13:15:17 +0000 (13:15 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 14 Jun 2012 13:15:17 +0000 (13:15 +0000)

Trivial merge