Merge "ContextSource::getContext() can return any IContextSource"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sat, 19 Jul 2014 13:06:02 +0000 (13:06 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sat, 19 Jul 2014 13:06:02 +0000 (13:06 +0000)

Trivial merge