Merge branch 'maint'

diff --git a/git-send-email.perl b/git-send-email.perl
index cccbf4517aa46d4d217a1ce25105f7c413301d2d..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
@@ -409,7 +410,7 @@ sub split_addrs {
        mailrc => sub { my $fh = shift; while (<$fh>) {
                if (/^alias\s+(\S+)\s+(.*)$/) {
                        # spaces delimit multiple addresses
-                       $aliases{$1} = [ split(/\s+/, $2) ];
+                       $aliases{$1} = [ quotewords('\s+', 0, $2) ];
                }}},
        pine => sub { my $fh = shift; my $f='\t[^\t]*';
                for (my $x = ''; defined($x); $x = $_) {