Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorScott Baker <smbaker@gmail.com>
Mon, 26 Jan 2015 06:16:24 +0000 (22:16 -0800)
committerScott Baker <smbaker@gmail.com>
Mon, 26 Jan 2015 06:16:24 +0000 (22:16 -0800)
commitef9db61058e6c5891721e997614c6c76905c230a
treeb08fc885abeca62ccb52e72c123b600aa07c5d4c
parentab385c86e10475c711c350f1ddf1cca0c2accd65
parent90ecab134bf44662886576bea76c48d0aea316b7
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
planetstack/core/admin.py