From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 31 Aug 2008 23:52:53 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc1~282
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7f314565fe20e324e8db1a7c233e43ca4e3683f0;p=git.git

Merge branch 'maint'

* maint:
  Document sendemail.envelopesender configuration
  Document clarification: gitmodules, gitattributes
  config.txt: Add missing colons after option name
---

7f314565fe20e324e8db1a7c233e43ca4e3683f0