more tiny merge misses
authorWilfried Goesgens <dothebart@citadel.org>
Mon, 5 Sep 2011 08:50:40 +0000 (08:50 +0000)
committerWilfried Goesgens <dothebart@citadel.org>
Mon, 5 Sep 2011 08:50:40 +0000 (08:50 +0000)
commit42efcdda20499cbaf04294ed41ff1699465849ee
treedfa7b483e7aa5188e4ed11f444010b546f2c158d
parent8670156642189cfde8327a0c71ddc13519f111a4
more tiny merge misses
citadel/context.c
citadel/modules/network/serv_network.c
citadel/modules/smtp/serv_smtpclient.c
citadel/po/citadel-setup/fr.po