From b6ba2d8b09a60e30abc2ad576bc5fb5126d16ccb Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Kolab Systems)" <vanmeeuwen@kolabsys.com>
Date: Fri, 4 Nov 2011 11:39:51 +0000
Subject: Merge stash - no changes

---
 pykolab/imap/cyrus.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'pykolab/imap')

diff --git a/pykolab/imap/cyrus.py b/pykolab/imap/cyrus.py
index c0f8c04..de66355 100644
--- a/pykolab/imap/cyrus.py
+++ b/pykolab/imap/cyrus.py
@@ -117,6 +117,8 @@ class Cyrus(cyruslib.CYRUS):
         if len(self.lm(mailfolder)) < 1:
             return self.server
 
+        # TODO: Murder capabilities may have been suppressed using Cyrus IMAP
+        # configuration.
         if not self.murder:
             return self.server
 
-- 
cgit v1.1