Merge branch 'master' into next

diff --git a/git-send-email.perl b/git-send-email.perl
index 0e368fff0cd6158108012b53eeb88496cc0a0632..ed1d89b3f73564715d0fe4061e87f63fea7e7be2 100755 (executable)
--- a/git-send-email.perl
+++ b/git-send-email.perl
@@ -21,7 +21,6 @@
 use Term::ReadLine;
 use Getopt::Long;
 use Data::Dumper;
-use Net::SMTP;
 
 # most mail servers generate the Date: header, but not all...
 $ENV{LC_ALL} = 'C';
@@ -394,6 +393,7 @@ sub send_message
                print $sm "$header\n$message";
                close $sm or die $?;
        } else {
+               require Net::SMTP;
                $smtp ||= Net::SMTP->new( $smtp_server );
                $smtp->mail( $from ) or die $smtp->message;
                $smtp->to( @recipients ) or die $smtp->message;