Merge "Revert "DefaultSettings.php: Remove $wgPasswordSenderName""
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 26 Feb 2014 09:40:51 +0000 (09:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 26 Feb 2014 09:40:51 +0000 (09:40 +0000)
1  2 
includes/DefaultSettings.php

Simple merge