* grumblegrumble conflict
authorWilfried Göesgens <willi@citadel.org>
Tue, 20 Oct 2009 12:57:57 +0000 (12:57 +0000)
committerWilfried Göesgens <willi@citadel.org>
Tue, 20 Oct 2009 12:57:57 +0000 (12:57 +0000)
commitd3673b5f893d2ac58ceccffce29388544882288a
tree39be2a711dbbe7f961d82130e78a56abc4303965
parent6ec73d6906542ea2f8cca2e62f7625ee2e17ae03
* grumblegrumble conflict
webcit/groupdav_main.c