Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
authorSapan Bhatia <gwsapan@gmail.com>
Wed, 11 Jun 2014 21:51:32 +0000 (17:51 -0400)
committerSapan Bhatia <gwsapan@gmail.com>
Wed, 11 Jun 2014 21:51:32 +0000 (17:51 -0400)
commite5774f96416642de8bba108387643fb27315de0a
tree720cb7a34644b6c843a34c2f35aecaf671e0f5e8
parentf7b29d209934e04409ec16bb4f66a520b70b10aa
parent7b836b685f36434a65afc6cf2e5e8fc0ccf0a3b8
Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

Conflicts:
planetstack/core/models/user.py
planetstack/core/models/user.py