Merge branch 'config-doc-fix' into jk/pu

* branch config-doc-fix:
  WIP

Submitted upstream
Merge branch 'pull-dont-suggest-merge' into jk/pu

* branch pull-dont-suggest-merge:
  pull: change the description to "integrate" changes
  push: avoid suggesting "merging" remote changes

Submitted upstream
Merge branch 't4205-locales' into jk/pu

* branch t4205-locales:
  t4205: don't rely on en_US.UTF-8 locale existing

Rejected as it will be fixed in a different way in the original
author's incremental updates to this series.  This should be
detectable as a conflict during rebuild so I'm keeping it around to
avoid test failures.
Merge branch 'rebase-i-comment-squash' into jk/pu

* branch rebase-i-comment-squash:
  rebase -i: comment first line of autosquashed message

Comment out the first line of a "!squash" commit when generating a
commit message in git-rebase.

Merged to jk/pu on 2013-03-30.  Dogfooding for a while to see if
this is a sensible change.
Merge branch 'format-patch-msgstore' into jk/pu

* branch format-patch-msgstore:
  msgstore-gmane: new Gmane message store helper
  format-patch: extract Cc recipients from in-reply-to message
  Extract RFC2822 from builtin/mailinfo.c
  rfc2822: extract header handling from mailinfo
  format-patch: dedup Cc list