Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:29:10 +0000 (13:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 23 Feb 2012 21:29:10 +0000 (13:29 -0800)
* maint:
  README: point to Documentation/SubmittingPatches
  Document merge.branchdesc configuration variable


Trivial merge