From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 9 Jul 2014 23:38:50 +0000 (+0000)
Subject: Merge "If $wgEnableEmail is false, disable other email settings"
X-Git-Tag: 1.31.0-rc.0~15021
X-Git-Url: http://git.cyclocoop.org/?a=commitdiff_plain;h=a75fe358911c0afd8b214e74f4030b3aaa9391df;p=lhc%2Fweb%2Fwiklou.git

Merge "If $wgEnableEmail is false, disable other email settings"
---

a75fe358911c0afd8b214e74f4030b3aaa9391df