Merged changes of lhs

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@4888 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index e023cc04223cf83e81d90a7e0f33d4607cc9d1ae..beef12f31ae967b68bb23388e207be83cb914fd2 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -49,6 +49,7 @@ class mailMethodKolab extends mailMethodCyrus
     return (TRUE);
   }
 
+  /* return all folders of the users mailbox*/
   function getMailboxList($folder, $uid= "")
   {
     global $config;