# HG changeset patch # User Paul Boddie # Date 1411507931 -7200 # Node ID db37d281b8ff1e480d71f45aadc5372b448fc366 # Parent 19d6312453bed7173056bafd85878e228c99bcd5# Parent 13b56c9ce817bb2d12fdd37d8e11d65cb448e705 Merge parallel changes. diff -r 19d6312453be -r db37d281b8ff imip_agent.py --- a/imip_agent.py Tue Sep 23 20:42:01 2014 +0200 +++ b/imip_agent.py Tue Sep 23 23:32:11 2014 +0200 @@ -130,7 +130,7 @@ return ( i < len(freebusy) and (dtend is None or freebusy[i][0] < dtend) or - i > 0 and freebusy[i - 1] > dtstart + i > 0 and freebusy[i - 1][1] > dtstart ) # Sending of outgoing messages.