Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
author Lars Hjemli <hjemli@gmail.com>
Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
diff --cc Makefile
Simple merge
diff --cc cgit.css
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 3 Jan 2012 16:48:22 +0000 (16:48 +0000)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.css	patch \|	diff1 \|	diff2 \|	blob \| history