Merge branch 'maint'

diff --git a/git-send-email.perl b/git-send-email.perl
index e3408d513fd5b3f504415021647351c7f9aeab91..e793935b4f2980aa1e333f7e8424b293b4b59399 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -210,6 +210,7 @@ sub do_edit {
     "envelopesender" => \$envelope_sender,
     "multiedit" => \$multiedit,
     "confirm"   => \$confirm,
+    "from" => \$sender,
 );
 
 # Handle Uncouth Termination