Ediciones a xscreensaver hechas por Archlinux
Merge branch 'master' of github.com:maturano/.dotfiles

Conflicts:
	xscreensaver