Merge branch 'maint'
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Nov 2010 17:36:49 +0000 (10:36 -0700)
commit31731b0ea4fccf5455ce367d483feaabdc411e0a
tree02b100f4b59557e9b2eb0f1392de697e812c3aa1
parente806c43537e2e9b5ab96d03b777a5759ef57b13d
parentaf77aee9cac51c2036e6019b4aebec2049f03e6b
Merge branch 'maint'

* maint:
  Fix a formatting error in git-merge.txt