conflict merge, bugfixes
authoradam <adam@megacz.com>
Fri, 7 May 2004 11:24:28 +0000 (11:24 +0000)
committeradam <adam@megacz.com>
Fri, 7 May 2004 11:24:28 +0000 (11:24 +0000)
commit9f0c3edcacb11544739b338c52afbc6efaaee5c0
treec4304a127ed9979e9add74085c46ac18d79ce94d
parentc09dcaa5936eb38ce02957a44df54a6e94a2aae7
conflict merge, bugfixes

darcs-hash:20040507112428-5007d-9dfcfaf3f90bf83feae565e1c74329826dc8b4fa.gz
src/org/ibex/mail/Message.java
src/org/ibex/mail/protocol/SMTP.java
src/org/ibex/mail/store/MessageStore.java
src/org/ibex/mail/target/Script.java