# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1366895076 -28800
# Node ID 898d0cfecffd1da9b61e8ba123d7613bb3732b9d
# Parent  0c28d37986eceb6651c690bc64397ece8e62b100# Parent  78255c49bf9a8abfe80cd11dfd32e4d9cc239010
merge

diff -r 78255c49bf9a -r 898d0cfecffd py/requirements.txt
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/py/requirements.txt	Thu Apr 25 21:04:36 2013 +0800
@@ -0,0 +1,7 @@
+argparse==1.2.1
+gevent==1.0rc2
+greenlet==0.4.0
+lockfile==0.9.1
+python-daemon==1.6
+smbus==1.1
+wsgiref==0.1.2
diff -r 78255c49bf9a -r 898d0cfecffd requirements.txt
--- a/requirements.txt	Thu Apr 25 21:03:53 2013 +0800
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-argparse==1.2.1
-gevent==1.0rc2
-greenlet==0.4.0
-lockfile==0.9.1
-python-daemon==1.6
-smbus==1.1
-wsgiref==0.1.2