fix more merge hickups
authorWilfried Goesgens <dothebart@citadel.org>
Tue, 6 Sep 2011 15:24:58 +0000 (15:24 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Tue, 6 Sep 2011 15:24:58 +0000 (15:24 +0000)
commit607094868c16b6a850d3c46892d5199a3403a848
tree3fb469d09a1bbe0a86483c695c69e0bd63d85e49
parent65f5a2ad00d060e7aee050f5e6e865dc6891e579
fix more merge hickups
citadel/modules/pop3client/serv_pop3client.c
citadel/modules/rssclient/serv_rssclient.c
citadel/threads.c