Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

author Wilfried Goesgens <dothebart@citadel.org>

Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)

committer Wilfried Goesgens <dothebart@citadel.org>

Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
author Wilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
committer Wilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
diff --cc webcit/sieve.c
Simple merge
diff --cc webcit/subst.c
Simple merge
author	Wilfried Goesgens <dothebart@citadel.org>
	Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
committer	Wilfried Goesgens <dothebart@citadel.org>
	Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
		1	2
webcit/sieve.c	patch \|	diff1 \|	diff2 \|	blob \| history
webcit/subst.c	patch \|	diff1 \|	diff2 \|	blob \| history