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