# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1423766550 -3600
# Node ID 9807df0a5e95730070fb60bbf477749804399632
# Parent  d44eb4aa42aca1d699077895f28843c56972e643# Parent  66ff7e91970605825003c58743e0fde136fcea14
Merged changes from the default branch.

diff -r d44eb4aa42ac -r 9807df0a5e95 imiptools/handlers/person.py
--- a/imiptools/handlers/person.py	Thu Feb 12 17:44:01 2015 +0100
+++ b/imiptools/handlers/person.py	Thu Feb 12 19:42:30 2015 +0100
@@ -123,9 +123,9 @@
         user = get_uri(self.recipient)
 
         for sender, sender_attr in senders:
-            stored_freebusy = self.store.get_freebusy_for_other(user, other)
+            stored_freebusy = self.store.get_freebusy_for_other(user, sender)
             replace_overlapping(stored_freebusy, (dtstart, dtend), freebusy)
-            self.store.set_freebusy_for_other(user, other, stored_freebusy, sender)
+            self.store.set_freebusy_for_other(user, sender, stored_freebusy, sender)
 
 class Event(PersonHandler):