# HG changeset patch
# User Matt Johnston <matt@ucc.asn.au>
# Date 1366895076 -28800
# Node ID 94d2bb7a366651d8cb9d718c31c4d1d78d53f425
# Parent  00dea0afb6bb8dac480835e8ec774c91ea382b5e# Parent  de4abcbe8f462d80f1c3b2aab647e309ee6427a7
merge

diff -r de4abcbe8f46 -r 94d2bb7a3666 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 de4abcbe8f46 -r 94d2bb7a3666 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