Merge branch 'lt/web'

author Junio C Hamano <junkio@cox.net>

Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)

committer Junio C Hamano <junkio@cox.net>

Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
author Junio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
committer Junio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge
author	Junio C Hamano <junkio@cox.net>
	Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
committer	Junio C Hamano <junkio@cox.net>
	Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
		1	2
.gitignore	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history