Merge "Automatically set $wgMainWANCache by default using $wgMainCacheType"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 24 Apr 2015 16:38:04 +0000 (16:38 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 24 Apr 2015 16:38:04 +0000 (16:38 +0000)

Trivial merge