Merge branch 'lh/sort-repolist'

author Lars Hjemli <hjemli@gmail.com>

Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)

committer Lars Hjemli <hjemli@gmail.com>

Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)
author Lars Hjemli <hjemli@gmail.com>
Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)
committer Lars Hjemli <hjemli@gmail.com>
Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)
diff --cc cgit.h
Simple merge
diff --cc ui-repolist.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)
committer	Lars Hjemli <hjemli@gmail.com>
	Sat, 6 Dec 2008 10:35:49 +0000 (11:35 +0100)
		1	2
cgit.h	patch \|	diff1 \|	diff2 \|	blob \| history
ui-repolist.c	patch \|	diff1 \|	diff2 \|	blob \| history