tree e83eb572a77e0357991b969942577b8b9c8a655d
parent d6cedb5161c02defd4c3e9ed8b91de51f7fd5b8f
parent 54077dfbf1b29d9846c283e4d46dcc35761e0c31
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