propagate from branch 'ca.inverse.sogo.1_3_12' (head 235258efee8273e9b6d2822d3d5da125520631c7)

to branch 'ca.inverse.sogo' (head b2bfdd5b59fed2950707131eca171b4758bcd635)

Monotone-Parent: 235258efee8273e9b6d2822d3d5da125520631c7
Monotone-Parent: b2bfdd5b59fed2950707131eca171b4758bcd635
Monotone-Revision: f67fbb0139df60f0e98c0aede6b166d1a8b15d81

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-08T04:24:33
Monotone-Branch: ca.inverse.sogo

SoObjects/Appointments/SOGoAppointmentFolder.m

@@ -2617,11 +2617,6 @@ firstInstanceCalendarDateRange: (NGCalendarDateRange *) fir
   return @"Appointment";
 }
 
-- (NSString *) outlookFolderClass
-{
-  return @"IPF.Appointment";
-}
-
 - (BOOL) isActive
 {
   SOGoUserSettings *settings;

SoObjects/Appointments/SOGoAppointmentFolders.h

@@ -26,6 +26,7 @@
 #import <SOGo/SOGoParentFolder.h>
 
 @class NSArray;
+@class NSMutableArray;
 
 @class SOGoWebAppointmentFolder;