Merge branch 'master' into ackbar

2015-02-09 17:16:42 -05:00 · 2015-02-09 17:16:42 -05:00 · 045614c6c8
commit 045614c6c8
parent 9dfe523615 c081b1fa86
29 changed files with 920 additions and 246 deletions
--- a/requirements-nover.txt
+++ b/requirements-nover.txt
@ -43,5 +43,6 @@ git+https://github.com/DevTable/pygithub.git
 git+https://github.com/jplana/python-etcd.git
 gipc
 pyOpenSSL
+pygpgme
 cachetools
 mock