Merge branch 'jc/1.7.0-send-email-no-thread-default'

* jc/1.7.0-send-email-no-thread-default:
  send-email: make --no-chain-reply-to the default

Conflicts:
	git-send-email.perl

diff --cc Documentation/git-send-email.txt
Simple merge

diff --cc git-send-email.perl
index 319b5356713b02a48508ee9af2d14781d8760e94,c1d093033dfda7f4dfda9ab4d4e4739c94b1af55..e05455f74c7e23c28cae41b68fa80df87c633ce9
--- 1/git-send-email.perl
--- 2/git-send-email.perl
+++ b/git-send-email.perl
@@@ -216,19 -213,6 +216,19 @@@ my %config_settings = 
      "from" => \$sender,
  );
  
-                   "In git 1.7.0, the default will be changed to --no-chain-reply-to\n" .
 +# Help users prepare for 1.7.0
 +sub chain_reply_to {
 +      if (defined $chain_reply_to &&
 +          $chain_reply_to eq $not_set_by_user) {
 +              print STDERR
-               $chain_reply_to = 1;
++                  "In git 1.7.0, the default has changed to --no-chain-reply-to\n" .
 +                  "Set sendemail.chainreplyto configuration variable to true if\n" .
 +                  "you want to keep --chain-reply-to as your default.\n";
++              $chain_reply_to = 0;
 +      }
 +      return $chain_reply_to;
 +}
 +
  # Handle Uncouth Termination
  sub signal_handler {