Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)
author Lars Hjemli <hjemli@gmail.com>
Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)
diff --cc Makefile
Simple merge
diff --cc cgit.c
Simple merge
diff --cc html.c
Simple merge
diff --cc ui-shared.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 5 Mar 2011 13:01:59 +0000 (14:01 +0100)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
html.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-shared.c	patch \|	diff1 \|	diff2 \|	blob \| history