Merge branch 'lh/remote-branches'

author Lars Hjemli <hjemli@gmail.com>

Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)
author Lars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)
diff --cc cgit.c
Simple merge
diff --cc cgit.h
Simple merge
diff --cc cgitrc.5.txt
Simple merge
diff --cc ui-refs.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Tue, 8 Dec 2009 18:34:30 +0000 (19:34 +0100)
		1	2
cgit.c	patch \|	diff1 \|	diff2 \|	blob \| history
cgit.h	patch \|	diff1 \|	diff2 \|	blob \| history
cgitrc.5.txt	patch \|	diff1 \|	diff2 \|	blob \| history
ui-refs.c	patch \|	diff1 \|	diff2 \|	blob \| history