Merge branch 'lt/web'
authorJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 13 Aug 2006 02:24:09 +0000 (19:24 -0700)
1  2 
.gitignore
Makefile

diff --cc .gitignore
Simple merge
diff --cc Makefile
Simple merge