Merge "Change \\ to \ in phpdoc"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Apr 2016 18:12:54 +0000 (18:12 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Apr 2016 18:12:54 +0000 (18:12 +0000)
1  2 
includes/DefaultSettings.php
includes/GlobalFunctions.php

Simple merge
Simple merge