From bd68aae78a5d696e4ccb9c0d267486c283a6d9d2 Mon Sep 17 00:00:00 2001
From: Marius Cramer <m.cramer@pixcept.de>
Date: Fri, 18 Oct 2013 08:49:59 -0400
Subject: [PATCH] Resolved differences from svn merge to trunk and git master

---
 interface/lib/shelluser_blacklist |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/interface/lib/shelluser_blacklist b/interface/lib/shelluser_blacklist
index c49d825..4913b64 100644
--- a/interface/lib/shelluser_blacklist
+++ b/interface/lib/shelluser_blacklist
@@ -31,4 +31,5 @@
 getmail
 ispconfig
 courier
-dovecot
\ No newline at end of file
+dovecot
+mongodb

--
Gitblit v1.9.1