Merge branch 'master' into next

* master:
  --summary output should print immediately after stats.
  git-svn: ignore expansion of svn:keywords
  git-svn: starting a 1.1.0-pre development version
  cvsimport: set up commit environment in perl instead of using env

diff --cc diff.c
index a7bb9b9,77c09a8..9e9cfc8
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -1989,10 -1988,10 +1989,13 @@@ void diff_flush(struct diff_options *op
                show_stats(diffstat);
                free(diffstat);
                diffstat = NULL;
 -              putchar(options->line_termination);
+               if (options->summary)
+                       for (i = 0; i < q->nr; i++)
+                               diff_summary(q->queue[i]);
 +              if (options->stat_sep)
 +                      fputs(options->stat_sep, stdout);
 +              else
 +                      putchar(options->line_termination);
        }
        for (i = 0; i < q->nr; i++) {
                struct diff_filepair *p = q->queue[i];