Merge branch 'master' of git.planet-lab.org:/git/plstackapi
authorSiobhan Tully <stully@verivue.com>
Tue, 2 Jul 2013 17:19:47 +0000 (13:19 -0400)
committerSiobhan Tully <stully@verivue.com>
Tue, 2 Jul 2013 17:19:47 +0000 (13:19 -0400)
1  2 
planetstack/core/admin.py

Simple merge