Merge "Fix documentation lies about debug toolbar / cache interaction"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 17 Mar 2016 10:04:59 +0000 (10:04 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 17 Mar 2016 10:04:59 +0000 (10:04 +0000)
1  2 
includes/DefaultSettings.php

Simple merge