Merge branch 'master' of git.planet-lab.org:/git/plstackapi
-rw-r--r-- 686 planetstack.deps
drwxr-xr-x - planetstack
-rw-r--r-- 851 setup.py