tree cefaa5d0d13621cf7283ee43f664a8af0d14fe90
parent f184e46a8afb36a6046be798abc964478cc89cba
parent 2f37006872f3435a348a649861908be9173c7d59
author Matteo Scandolo <teo@onlab.us> 1449083270 -0800
committer Matteo Scandolo <teo@onlab.us> 1449083270 -0800

Merge commit '2f37006872f3435a348a649861908be9173c7d59' into feature/bootstrap

# Conflicts:
#	xos/xos/settings.py