Merge branch 'master' of git.planet-lab.org:/git/plstackapi
authorSiobhan Tully <stully@verivue.com>
Fri, 6 Sep 2013 14:56:06 +0000 (10:56 -0400)
committerSiobhan Tully <stully@verivue.com>
Fri, 6 Sep 2013 14:56:06 +0000 (10:56 -0400)
commit2d95e48d394480aa22596105c9ca469fb5c4c923
tree296fb48eed62d8ca7ea376732e5f190c98d4267b
parentbfd11dcba19b93cf3cc4c074bf9d71547806d47d
parentd3d122ee1de0f509a2f559a40989de9a3dceeb3c
Merge branch 'master' of git.planet-lab.org:/git/plstackapi

Conflicts:
planetstack/core/admin.py
planetstack/planetstack/urls.py
planetstack/core/admin.py
planetstack/core/models/__init__.py