Merge "Make WikiMap fall back to sites if a site couldn't be found using $wgConf"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 7 Oct 2015 16:25:50 +0000 (16:25 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 7 Oct 2015 16:25:50 +0000 (16:25 +0000)

Trivial merge