Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Scott Baker [Mon, 26 Jan 2015 06:16:24 +0000 (22:16 -0800)]
1  2 
planetstack/core/admin.py

Simple merge