# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1357818392 -28800
# Node ID ad22db765ba1602ec902bcdcc35abc724674cca7
# Parent  a6612745b4a3396fbf30402d072be2cab9fb1ae9# Parent  256505f98c4df0f1e64e9a9ea4cda8e4e5a3e33e
merge

diff -r 256505f98c4d -r ad22db765ba1 py/fridge.py
--- a/py/fridge.py	Thu Jan 03 22:37:33 2013 +0800
+++ b/py/fridge.py	Thu Jan 10 19:46:32 2013 +0800
@@ -126,4 +126,4 @@
             if turn_on:
                 L("Turning fridge on")
                 self.on()
-                fridge_on_clock = self.server.now()
+                self.fridge_on_clock = self.server.now()