Apply single tagset patch
Merge branch 'master' into singletagset

Conflicts:
	dwm.c