Merge branch 'no_colon_separators'

author Andre <maan@p133.(none)>

Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)

committer Andre <maan@p133.(none)>

Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
author Andre <maan@p133.(none)>
Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
committer Andre <maan@p133.(none)>
Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
diff --cc filter.c
Simple merge
diff --cc filter_chain.c
Simple merge
author	Andre <maan@p133.(none)>
	Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
committer	Andre <maan@p133.(none)>
	Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
		1	2
filter.c	patch \|	diff1 \|	diff2 \|	blob \| history
filter_chain.c	patch \|	diff1 \|	diff2 \|	blob \| history