Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Sat, 2 Jul 2011 23:38:15 +0000 (01:38 +0200)
committerthe_mgt <themgt@ueberserver.de>
Sat, 2 Jul 2011 23:38:15 +0000 (01:38 +0200)
commit608f0be330912658d8294a084cb773496d849ce8
treebb002a7969e70d75ae1f489b09cd611366f35ce3
parentead34672ccee9ecd84a34ebd2db8441efe81dbd5
parent1423eb9402b934a3f524a9b7bfd593e9b004cc0a
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

Conflicts:
webcit/sieve.c
webcit/sieve.c
webcit/static/t/who/bio.html
webcit/subst.c