Merge branch 'maint'

* maint:
  Start 1.6.0.4 cycle
  add instructions on how to send patches to the mailing list with Gmail
  Documentation/gitattributes: Add subsection header for each attribute
  git send-email: avoid leaking directory file descriptors.
  send-pack: do not send out single-level refs such as refs/stash
  fix overlapping memcpy in normalize_absolute_path
  pack-objects: avoid reading uninitalized data
  correct cache_entry allocation

Conflicts:
	RelNotes

diff --cc Documentation/SubmittingPatches
Simple merge

diff --cc Documentation/gitattributes.txt
Simple merge

diff --cc builtin-pack-objects.c
index 59c30d1caa37416041177ff4aaf01b67f4e8add4,b0dddbee4f93de462090218554e1b1b6d1038c34..15b80db5a1a43ae2ae44375c2cb27978c2e70a71
--- 1/builtin-pack-objects.c
--- 2/builtin-pack-objects.c
+++ b/builtin-pack-objects.c
@@@ -1372,10 -1372,12 +1372,10 @@@ static void find_deltas(struct object_e
        struct unpacked *array;
        unsigned long mem_usage = 0;
  
 -      array = xmalloc(array_size);
 -      memset(array, 0, array_size);
 +      array = xcalloc(window, sizeof(struct unpacked));
  
        for (;;) {
-               struct object_entry *entry = *list++;
+               struct object_entry *entry;
                struct unpacked *n = array + idx;
                int j, max_depth, best_base = -1;
  

diff --cc builtin-send-pack.c
Simple merge

diff --cc git-send-email.perl
Simple merge