tree f2b5171729bf76040a4117ba7e2d6e68013c1c74
parent c9bb11a366b9126009fcdb92df5817c60ba62000
parent 215ab7e04495f829caf3583237fbe6c41ec8b40e
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