From: Ben Beltran <redacted>
Date: Mon, 16 Jun 2014 13:07:49 +0000 (-0500)
Subject: Merge branch 'master' of github.com:benbeltran/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/c06591654132cbc1c241d570e02ae518882e8c67

Merge branch 'master' of github.com:benbeltran/dotfiles

Conflicts:
	.gitignore
	vim/bundle/searchfold.vim
	vim/bundle/taglist
	vim/bundle/vim-indent-object
---

c06591654132cbc1c241d570e02ae518882e8c67