tree fe3433370b9e86e434fb14c20b765504ad26d6b3
parent a48dc1163f88097c9f524814c8bd7a59932287f0
parent 336dda1644cdf0cebe5055b8bf19ce6e5293079a
author Scott Baker <smbaker@gmail.com> 1460144403 -0700
committer Scott Baker <smbaker@gmail.com> 1460144403 -0700

Merge branch 'feature/api-cleanup' of github.com:open-cloud/xos into feature/api-cleanup