Merge branch 'jk/asciidoc-update' into next
commit72ffafe9345cc7d1cd09252b29226543a4903d15
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:27 +0000 (8 12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:27 +0000 (8 12:25 -0800)
tree47a36996a07e9623faeef5ef8caa0d0968f08d61
parentf5ca80a617529275fda3188c0ce014cc042862cb
parent79c461d5b1139afa3d3997c7ef9ee521562b2a1a
Merge branch 'jk/asciidoc-update' into next

* jk/asciidoc-update:
  docs: default to more modern toolset
Documentation/RelNotes/1.7.4.txt
Makefile
config.mak.in
configure.ac