Merge "Reformatted to satisfy PHP_CodeSniffer"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 8 Feb 2013 16:01:32 +0000 (16:01 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 8 Feb 2013 16:01:32 +0000 (16:01 +0000)
commitc9d99b0f589352a21d91bde5896c66b87937ae52
tree2d14edef9529b2e7bca62b2f561c0a27ea73abf9
parentaa40b35cc08a9307847d52d05b1f216cac578a06
parent39a64840416e8af18030848d9c175b1b095be5cd
Merge "Reformatted to satisfy PHP_CodeSniffer"
includes/DefaultSettings.php