Public Git Hosting - vimrc.git/commit

commit	21f6f2dfe5137512ce231cc7eb734c4b40248004
author	Kevin Watters <kevinwatters@gmail.com>
	Mon, 20 Oct 2008 20:38:26 +0000 (20 16:38 -0400)
committer	Kevin Watters <kevinwatters@gmail.com>
	Mon, 20 Oct 2008 20:38:26 +0000 (20 16:38 -0400)
tree	96f77dd6a6c9ff5e56dcb67b687337de87ff92a2	tree \| snapshot (tar.gz zip)
parent	b4ba6e7dbb3ae568f7cbdf5ba149c977553b4d8c	commit \| diff
parent	ddf25844524fadd08e9e461dcf423b77c70395dc	commit \| diff

Merge branch 'master' of ssh://kevinw@repo.or.cz/srv/git/vimrc

Conflicts:

.vimrc
plugin/fuzzyfinder_textmate.vim