Files on pon, 21 lip 2014, 20:40:56 CEST
Merge branch 'master' of https://github.com/lukequaint/dotfiles

Conflicts:
	vim/vimrc