tree 6c1d8cc34ecd9fd53afdca4f32e22c5cf7189c60
parent a7919e24c4217ac9602fd3af83fa291ebde23196
parent 714cf968b32003666a9c0db01994837c5616cd00
author Scott Baker <smbaker@gmail.com> 1459467887 -0700
committer Scott Baker <smbaker@gmail.com> 1459467887 -0700

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