Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)
author Lars Hjemli <hjemli@gmail.com>
Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)
diff --cc cgit.c
Simple merge
diff --cc ui-shared.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 27 Feb 2010 11:53:27 +0000 (12:53 +0100)
		1	2
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-shared.c	patch \|	diff1 \|	diff2 \|	blob \| history