Merge branch 'master' into 'master'

Marius Cramer

2015-03-06 39a2d33c4680fe0a0fcd10e864d075f520d9905e

 server/plugins-available/mail_plugin_dkim.inc.php

@@ -405,7 +405,7 @@
         }

         /* resync */
         if ($data['new']['active'] == 'y' && $data['new'] == $data['old']) {
         if ($data['new']['active'] == 'y' && $data['new'] == $data['old'] && $data['new']['dkim']=='y') {
            $this->add_dkim($data);
         }
      }