tree 278d33e286074aed4acdb92d63a0ba43b392a9f4
parent 3e85799ba5eb33f9ebd12be7e1026bfbe5f58541
author Scott Baker <smbaker@gmail.com> 1442248932 -0700
committer Scott Baker <smbaker@gmail.com> 1442248932 -0700

autogenerated xosapi.py to resolve merge conflict