Merge branch 'stable-3.1'

Marius Burkard

2016-07-10 e1ceb050e19c7574bca146a8da7047ee4ff456b5

 server/plugins-available/getmail_plugin.inc.php

@@ -100,7 +100,11 @@

         if($data["new"]["active"] == 'y') {
            // Open master template
            $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
            if(file_exists($conf["rootpath"].'/conf-custom/getmail.conf.master')) {
               $tpl = file_get_contents($conf["rootpath"].'/conf-custom/getmail.conf.master');
            } else {
               $tpl = file_get_contents($conf["rootpath"].'/conf/getmail.conf.master');
            }

            // Shall emails be deleted after retrieval
            if($data["new"]["source_delete"] == 'y') {