latest
Merge

Merge branch 'master' of github:pauladam/dotconfigs

Conflicts:
	gitconfig
offlineimaprc
Merge branch 'master' of github:pauladam/dotconfigs
merge