# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1392127863 -28800
# Node ID f2e990b9963743c78006b4aed3d96fd51fdc971f
# Parent  46e327c00246bf1f6a96a20e86b97b5544a79f01# Parent  1865674794c33bc18d285d19bf90e8b4ce1fb8aa
merge

diff -r 46e327c00246 -r f2e990b99637 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()