merge of 'b5720d1cdf1d7a97ffae696deda5507c61e52da1'

and 'd4d75da556a634766f5532f5398f2f94ef2ba8df'

Monotone-Parent: b5720d1cdf1d7a97ffae696deda5507c61e52da1
Monotone-Parent: d4d75da556a634766f5532f5398f2f94ef2ba8df
Monotone-Revision: bfece4528b81534d630f73e8a0253a500274486d

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-01-30T19:44:20
maint-2.0.2
Francis Lachapelle 2012-01-30 19:44:20 +00:00
commit 7dcdc01a6e
2 changed files with 2 additions and 1 deletions

1
NEWS
View File

@ -10,6 +10,7 @@ Enhancements
- now possible to use memcached over a UNIX socket
- increase size of content columns
- improved import of .ics files
- new cronjob template with commented out entries
Bug Fixes
- alarms for tasks now depend on the start date and instead of the due date

View File

@ -1222,7 +1222,7 @@ static inline BOOL _occurenceHasID (iCalRepeatableEntityObject *occurence,
folder = [[self container] ocsFolder];
if (!folder)
{
[self errorWithFormat:@"(%s): missing folder for fetch!",
[self errorWithFormat:@"(%s): missing folder for update!",
__PRETTY_FUNCTION__];
return;
}