Merge branch 'master' of gitorious.org:moonshot-identity-client/moonshot-client