Merge branch 'tp/send-email-from-config'

* tp/send-email-from-config:
send-email: Add config option for sender address

diff --combined git-send-email.perl
index e3408d513fd5b3f504415021647351c7f9aeab91,d9c7f32aa3cd3d6c24e7f9a915053a38792c4077..e793935b4f2980aa1e333f7e8424b293b4b59399
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
@@@ -210,6 -210,7 +210,7 @@@ my %config_settings = 
      "envelopesender" => \$envelope_sender,
      "multiedit" => \$multiedit,
      "confirm"   => \$confirm,
+     "from" => \$sender,
  );
  
  # Handle Uncouth Termination
@@@ -409,7 -410,7 +410,7 @@@ my %parse_alias = 
        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 = $_) {