Apply single tagset patch
Merge branch 'master' into single-tagset

Conflicts:
	dwm.c