Merge "DefaultSettings: Remove "~~~~" from comment to fix Doxygen parse error"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Sun, 5 Apr 2015 13:07:06 +0000 (13:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Sun, 5 Apr 2015 13:07:06 +0000 (13:07 +0000)
1  2 
includes/DefaultSettings.php

Simple merge