Merge branch 'maint'

author Junio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)

committer Junio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)
author: Junio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)
committer: Junio C Hamano <gitster@pobox.com>
Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)
diff --cc Documentation/config.txt
Simple merge
diff --cc diff.c
Simple merge
author	Junio C Hamano <gitster@pobox.com>
author	Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)
committer	Junio C Hamano <gitster@pobox.com>
committer	Wed, 21 Jan 2009 09:08:10 +0000 (01:08 -0800)
		1	2
Documentation/config.txt	patch \|	diff1 \|	diff2 \|	blob \| history
diff.c	patch \|	diff1 \|	diff2 \|	blob \| history