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

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

diff --git a/.gitignore b/.gitignore
index 5673cb2b784daf9eac4fbba297855ba0311ccf19..ae7e1b8891515fa8d0484b7c4a302a2824251df3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 vim/.backup
+weechat/logs