Merge branch 'master' into v2

2015-02-05 15:37:14 -05:00 · 2015-02-05 15:37:14 -05:00 · cf774e23df
commit cf774e23df
parent a12bfa7623 e5c8d72855
74 changed files with 2123 additions and 1433 deletions
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@ -1,4 +1,4 @@
-autobahn
+autobahn==0.9.3-3
 aiowsgi
 trollius
 peewee
@ -40,5 +40,8 @@ git+https://github.com/DevTable/aniso8601-fake.git
 git+https://github.com/DevTable/anunidecode.git
 git+https://github.com/DevTable/avatar-generator.git
 git+https://github.com/DevTable/pygithub.git
+git+https://github.com/jplana/python-etcd.git
 gipc
-pygpgme
+pygpgme
+cachetools
+mock