# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1357818392 -28800
# Node ID bd01dca5f5b41973ab192f9db4e6af083e3505a8
# Parent  176fc5b68a3fed46002c5817be6b057ba39cf1a9# Parent  c34083c078dbb3510594b059a1acf982c1f2a91d
merge

diff -r c34083c078db -r bd01dca5f5b4 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()