Merge branch 'systray'
Merge branch 'pertag'
Merge branch 'noborder'
Merge branch 'stacker'

Conflicts:
	dwm.c
Merge branch 'xtile-gaps'

Conflicts:
	config.def.h
Config.