From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Dec 2010 22:32:52 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.7.4-rc0~97
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2de3c142d3dc4ef329a3984af32583cf1e5af432;p=git.git

Merge branch 'maint'

* maint:
  Git 1.7.0.8
  Documentation: Fix mark-up of lines with more than one tilde

Conflicts:
	GIT-VERSION-GEN
---

2de3c142d3dc4ef329a3984af32583cf1e5af432