tree 285e29115eb65c48dc485cb82a8219cb63cd5161
parent 9d2ea09d8290948fd212a315a33b11841852705f
parent 91dd0751b9e0384ccd14f2c1711e85ff19e91145
author Tony Mack <tmack@cs.princeton.edu> 1430929941 -0400
committer Tony Mack <tmack@cs.princeton.edu> 1430929941 -0400

merge
Merge branch 'master' of github.com:open-cloud/xos into service_permissions