xx
Merge branch 'master' of https://github.com/qvandekadsye/MailCOO

Conflicts:
	bin/vdk/oukkal/mail/Main.class
Merge branch 'master' of https://github.com/qvandekadsye/MailCOO

Conflicts:
	bin/vdk/oukkal/mail/PromissoryNote.class