tree 720cb7a34644b6c843a34c2f35aecaf671e0f5e8
parent f7b29d209934e04409ec16bb4f66a520b70b10aa
parent 7b836b685f36434a65afc6cf2e5e8fc0ccf0a3b8
author Sapan Bhatia <gwsapan@gmail.com> 1402523492 -0400
committer Sapan Bhatia <gwsapan@gmail.com> 1402523492 -0400

Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi

Conflicts:
	planetstack/core/models/user.py