Merge branch 'reject_sender_login_mismatch' into mdbox-format

Dominik

2015-04-25 afe87b044dc20ceb104b31213543c14b562facd7

interface/web/tools/import_plesk.php does not exist in tree 0fe90e8f58a5768ce0d8537cad816a556287812d