Michael Stapelberg ec0113f631 Merge branch 'next' ...

Conflicts:
	src/manage.c
	src/util.c
	src/xinerama.c

2009-08-19 15:13:27 +02:00

..

index.html

Merge branch 'next'

2009-08-19 15:13:27 +02:00