Merge branch 'master' into next

author Michael Stapelberg <michael@stapelberg.de>

Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)

committer Michael Stapelberg <michael@stapelberg.de>

Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
author Michael Stapelberg <michael@stapelberg.de>
Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
committer Michael Stapelberg <michael@stapelberg.de>
Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
diff --cc src/main.c
Simple merge
diff --cc src/manage.c
Simple merge
author	Michael Stapelberg <michael@stapelberg.de>
	Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
committer	Michael Stapelberg <michael@stapelberg.de>
	Tue, 16 Aug 2011 23:52:45 +0000 (01:52 +0200)
		1	2
src/main.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/manage.c	patch \|	diff1 \|	diff2 \|	blob \| history