# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1392127863 -28800
# Node ID e13146001852d4264c1a39b7985e8fcbd73a9191
# Parent  8318d50d766d28f9e395082add2279cf2f0b253b# Parent  f4aabbf0da675e3bf77e0b6507b82e8c52d87ce5
merge

diff -r 8318d50d766d -r e13146001852 py/uploader.py
--- a/py/uploader.py	Tue Feb 11 22:10:32 2014 +0800
+++ b/py/uploader.py	Tue Feb 11 22:11:03 2014 +0800
@@ -33,7 +33,7 @@
         tosend['wort_name'] = self.server.wort_name
         tosend['fridge_name'] = self.server.wort_name
 
-        tosend.update(dict(self.server.params))
+        tosend['current_params'] = dict(self.server.params)
 
         tosend['start_time'] = self.server.start_time
         tosend['uptime'] = utils.uptime()