Merge branch 'no_colon_separators'
authorAndre <maan@p133.(none)>
Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
committerAndre <maan@p133.(none)>
Thu, 9 Mar 2006 15:36:56 +0000 (16:36 +0100)
1  2 
filter.c
filter_chain.c

diff --cc filter.c
Simple merge
diff --cc filter_chain.c
Simple merge