# HG changeset patch # User Paul Boddie # Date 1423767213 -3600 # Node ID f0c65caa19e0e01fcb75cf8437ba816719fb6924 # Parent 9807df0a5e95730070fb60bbf477749804399632# Parent 357d7fca11a0e0f5a1dabb5c25790c3a5b8a9436 Merged changes from the default branch. diff -r 9807df0a5e95 -r f0c65caa19e0 imiptools/handlers/person.py --- a/imiptools/handlers/person.py Thu Feb 12 19:42:30 2015 +0100 +++ b/imiptools/handlers/person.py Thu Feb 12 19:53:33 2015 +0100 @@ -125,7 +125,7 @@ for sender, sender_attr in senders: stored_freebusy = self.store.get_freebusy_for_other(user, sender) replace_overlapping(stored_freebusy, (dtstart, dtend), freebusy) - self.store.set_freebusy_for_other(user, sender, stored_freebusy, sender) + self.store.set_freebusy_for_other(user, sender, stored_freebusy) class Event(PersonHandler):