Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
Sapan Bhatia [Wed, 11 Jun 2014 21:51:32 +0000 (17:51 -0400)]
Conflicts:
planetstack/core/models/user.py

1  2 
planetstack/core/models/user.py

Simple merge