smtpsec
Merge branch 'master' of http://github.com/lanrat/dotfiles

Conflicts:
	shell/bashrc
Merge branch 'master' of http://github.com/lanrat/dotfiles
fix for keeping ssh-keys
Merge branch 'master' of github.com:lanrat/dotfiles