tree b736a22cf32310e9b0be0dc7e3f85946b51c9611
parent 0744cf49ec4b841bdcf1fff0811f034f1d52561c
parent 7ec36230b8d80b117f4c79f5529065c94d51ee6a
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