From 178258f86cdf00b9c047023b97937c794bac88ec Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Mon, 29 Sep 2014 13:00:54 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 interface/web/admin/form/server_config.tform.php |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/interface/web/admin/form/server_config.tform.php b/interface/web/admin/form/server_config.tform.php
index 8c6f899..71f2f13 100644
--- a/interface/web/admin/form/server_config.tform.php
+++ b/interface/web/admin/form/server_config.tform.php
@@ -313,6 +313,12 @@
 			'width' => '40',
 			'maxlength' => '255'
 		),
+		'dkim_strength' => array(
+			'datatype' => 'INTEGER',
+			'formtype' => 'SELECT',
+			'default' => '1024',
+			'value' => array('1024' => 'normal (1024)', '2048' => 'strong (2048)', '4096' => 'very strong (4096)')
+		),
         'relayhost_password' => array(
             'datatype' => 'VARCHAR',
             'formtype' => 'TEXT',

--
Gitblit v1.9.1