conflict merge, bugfixes
[org.ibex.mail.git] / Makefile
2004-05-07 adamfixups
2004-05-02 adamit compiles!