# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1342533595 -28800
# Node ID 594d8be26bfbc8b3ba460411e5bb588bbe0761be
# Parent  ea97015f6bc5c5d3eb8c401084d7bacf0878187f# Parent  d9b78a1bdd1d28e44e3f406f95a54cf4479ad875
merge

diff -r ea97015f6bc5 -r 594d8be26bfb server/ts.py
--- a/server/ts.py	Mon Jul 16 22:58:33 2012 +0800
+++ b/server/ts.py	Tue Jul 17 21:59:55 2012 +0800
@@ -110,7 +110,7 @@
 
     rem = int(toks['rem'])
     tick_secs = int(toks['tick_secs'])
-    tick_wake = int(toks['tick_wake'])
+    tick_wake = int(toks['tick_wake']) + 1
     next_wake = int(toks['next_wake'])
 
     rem_secs = float(rem) / tick_wake * tick_secs
diff -r ea97015f6bc5 -r 594d8be26bfb web/log.py
--- a/web/log.py	Mon Jul 16 22:58:33 2012 +0800
+++ b/web/log.py	Tue Jul 17 21:59:55 2012 +0800
@@ -161,7 +161,7 @@
 def time_rem(name, entries):
     val_ticks = int(entries[name])
     val_rem = int(entries['%s_rem' % name])
-    tick_wake = int(entries['tick_wake'])
+    tick_wake = int(entries['tick_wake']) + 1
     tick_secs = int(entries['tick_secs'])
     return val_ticks + float(val_rem) * tick_secs / tick_wake