Merge branch 'pb/send-email-te'

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 9335ff2ae29c532f82bbb18220a3a2ea3531b8b4..b563ea8d3477aa686d332a321d684f6659e9fe06 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -2318,6 +2318,7 @@ sendemail.smtpserverport::
 sendemail.smtpserveroption::
 sendemail.smtpuser::
 sendemail.thread::
+sendemail.transferencoding::
 sendemail.validate::
        See linkgit:git-send-email[1] for description.