tree 575c6b5793109a5b9220477fe35a5004fc4a331b
parent 90621b32c84d3e41a20b368de90698e82bfc92a8
parent 41d4bed925624cdc033452c69deeedaabf2f7e88
author Matteo Scandolo <teo@onlab.us> 1453943148 -0800
committer Matteo Scandolo <teo@onlab.us> 1453943148 -0800

Merge branch 'master' of github.com:open-cloud/xos into feature/subscriber-portal

# Conflicts:
#	xos/core/xoslib/methods/loginview.py