fixens
fixens
Merge branch 'master' of ssh://github.com/mshade/dotfiles

Conflicts:
	.config/Trolltech.conf
	.xinitrc