conflict resolution
authoradam <adam@megacz.com>
Sun, 21 Jan 2007 23:12:36 +0000 (23:12 +0000)
committeradam <adam@megacz.com>
Sun, 21 Jan 2007 23:12:36 +0000 (23:12 +0000)
commite2f945712cd67ace6e629f73beb662f7ecb7beaa
treedd86a578804fe2da2e42793d4c03ae9cac8bd94a
parent8a4fb7b7043f096c7901f147295e5a539fbd71a6
conflict resolution

darcs-hash:20070121231236-5007d-001e52740ec9db93e39403ff5898a37bfd4dfc22.gz
src/org/ibex/mail/protocol/NNTP.java
src/org/ibex/mail/target/FileBasedMailbox.java