gistfile1.txt

.gitignore: needs merge
vud.install: needs merge
vud.module: needs merge
vud_comments/CVS/Entries: needs merge
# Changed but not updated:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	unmerged:   .gitignore
#	unmerged:   vud.install
#	unmerged:   vud.module
#	unmerged:   vud_comments/CVS/Entries
#