Merge branch 'master' into 'master'

Marius Cramer

2015-01-05 dee987b263b021b990ea4c62cb15be47c6d61fb5

 interface/web/mail/mail_domain_edit.php

@@ -214,7 +214,7 @@
      $app->tpl->setVar('dkim_selector', $rec['dkim_selector']);
      $app->tpl->setVar('dkim_private', $rec['dkim_private']);
      $app->tpl->setVar('dkim_public', $rec['dkim_public']);
      if (isset($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record);
      if (!empty($rec['dkim_public'])) $app->tpl->setVar('dns_record', $dns_record);

      parent::onShowEnd();
   }