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)
commitbb19ead75affaf68cbcfd0bf1063b2a68a833ba3
tree9a4b4d4096ccb676784f8252b68f9b8329f41964
parent5d7dc8d61e5c8f1bdaf629766b58556ac0baa30e
parent66f4e61148ac4d3d694112f9174422f36cce96d0
Merge branch 'master' of git.planet-lab.org:/git/plstackapi
planetstack/core/admin.py