Merge branch 'fh/mimetypes'

author Lars Hjemli <hjemli@gmail.com>

Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)

committer Lars Hjemli <hjemli@gmail.com>

Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)
author Lars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)
committer Lars Hjemli <hjemli@gmail.com>
Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)
diff --cc cgit.c
Simple merge
diff --cc cgit.h
Simple merge
diff --cc cgitrc.5.txt
Simple merge
diff --cc ui-plain.c
Simple merge
author	Lars Hjemli <hjemli@gmail.com>
	Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)
committer	Lars Hjemli <hjemli@gmail.com>
	Sun, 18 Mar 2012 21:01:28 +0000 (21:01 +0000)
		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-plain.c	patch \|	diff1 \|	diff2 \|	blob \| history