tree 285e29115eb65c48dc485cb82a8219cb63cd5161
parent 950b4490d307c35c897d3317ec7acf088d34aaee
parent ff453baa53897abe27a510aa47cb165a17d2b1dc
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