Merge branch 'stable'

author Lars Hjemli <hjemli@gmail.com>

Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)

committer Lars Hjemli <hjemli@gmail.com>

Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)
author Lars Hjemli <hjemli@gmail.com>
Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)
committer Lars Hjemli <hjemli@gmail.com>
Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)
diff --cc cgit.c
Simple merge
diff --cc ui-tag.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)
committer	Lars Hjemli <hjemli@gmail.com>
	Mon, 17 Aug 2009 08:17:23 +0000 (10:17 +0200)
		1	2
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
ui-tag.c	patch \|	diff1 \|	diff2 \|	blob \| history