From: Sapan Bhatia <gwsapan@gmail.com>
Date: Wed, 11 Jun 2014 21:51:32 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/plstackapi
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=e5774f96416642de8bba108387643fb27315de0a;p=plstackapi.git

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

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

e5774f96416642de8bba108387643fb27315de0a