Merge branch 'master' of git.ispconfig.org:renky/ispconfig3

Dominik

2015-01-21 83aa23b76fbdca327c52bd14fc1a1bc62aa5b3ee

 server/plugins-available/maildeliver_plugin.inc.php

@@ -131,6 +131,7 @@
         $tpl->setLoop('ccloop', $tmp_addresses_arr);

         // Custom filters
         if($data["new"]["custom_mailfilter"] == 'NULL') $data["new"]["custom_mailfilter"] = '';
         $tpl->setVar('custom_mailfilter', $data["new"]["custom_mailfilter"]);

         // Move junk