Merge remote-tracking branch 'origin/master' into everard

This commit is contained in:
Thomas Ruoff
2015-04-07 12:07:15 +02:00
4 changed files with 2106 additions and 105 deletions

4
.gitignore vendored
View File

@@ -1,7 +1,5 @@
irssi
vim/bundle/*
!vim/bundle/Vundle.vim
vim/plugged/*
vim/spell
.netrwhist
Xresources.compiled