tree 7f522804ea9de743d35f74b078d081af4eaae38d
parent 3eeaecf5d465ea08a4f9648dccb8749b41c93d3f
parent e2193ba9b334c3ffea8453e18b4d08a32ee34f18
author Scott Baker <smbaker@gmail.com> 1459981305 -0700
committer Scott Baker <smbaker@gmail.com> 1459981305 -0700

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