From 374226ae8d8c90954df425fc029b10f4e05d709e Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Wed, 08 Jul 2015 10:42:16 -0400
Subject: [PATCH] Merge branch 'master' into 'master'

---
 install/tpl/debian6_dovecot2.conf.master |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/install/tpl/debian6_dovecot2.conf.master b/install/tpl/debian6_dovecot2.conf.master
index ee77f4e..82c7e47 100644
--- a/install/tpl/debian6_dovecot2.conf.master
+++ b/install/tpl/debian6_dovecot2.conf.master
@@ -1,5 +1,5 @@
 listen = *,[::]
-protocols = imap pop3 lmtp
+protocols = imap pop3
 auth_mechanisms = plain login
 disable_plaintext_auth = no
 log_timestamp = "%Y-%m-%d %H:%M:%S "
@@ -61,4 +61,4 @@
 protocol lmtp {
   postmaster_address = webmaster@localhost
   mail_plugins = quota sieve
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1