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)
commit6a609823f449e88a3e6c7f3ce5c980ccf73edcb0
treed83ff752694fca22c16e8f4e296b2ec20b3d0a88
parentd46f476cb26f647e4571b5ccfba516d30ee06c63
parent07f050c9996cbda2af8d42996ebd349dcdb4c28d
Merge branch 'maint'

* maint:
  README: point to Documentation/SubmittingPatches
  Document merge.branchdesc configuration variable