dotfiles/valentine commit for Fri Jan 31 01:35:22 MST 2014
Merge branch 'valentine'

Conflicts:
	.config/herbstluftwm/autostart
dotfiles/valentine commit for Fri Jan 31 13:47:52 MST 2014