Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 22:32:52 +0000 (14:32 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 2 Dec 2010 22:32:52 +0000 (14:32 -0800)
* maint:
Git 1.7.0.8
Documentation: Fix mark-up of lines with more than one tilde

Conflicts:
GIT-VERSION-GEN

Trivial merge