Bashkinator/Effectiveness-Mail — pull request #4 by sider2302 (2014-10-28 07:33:15+00:00)
Title: Merge origin/java into dev

Conflicts:
nbproject/project.properties
src/smtpserver/DataBase.java
src/smtpserver/SmtpSession.java