Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorWilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Sat, 2 Jul 2011 22:44:48 +0000 (22:44 +0000)
commit1423eb9402b934a3f524a9b7bfd593e9b004cc0a
treed13d13c1bbddbe513185c0c4e1cbe695cb5b16a6
parentaf9dbefecea322adce7a5837da7497f20d0939ab
parent19f791fd52ba961a953ab958dbae63a420414afd
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
webcit/sieve.c
webcit/sieve.c
webcit/subst.c