commit | 579df9f5fec748f5fceac11dc58344ba4c7910a6 | [log] [tgz] |
---|---|---|
author | Tony Mack <tmack@cs.princeton.edu> | Wed May 06 12:32:21 2015 -0400 |
committer | Tony Mack <tmack@cs.princeton.edu> | Wed May 06 12:32:21 2015 -0400 |
tree | 285e29115eb65c48dc485cb82a8219cb63cd5161 | |
parent | 950b4490d307c35c897d3317ec7acf088d34aaee [diff] | |
parent | ff453baa53897abe27a510aa47cb165a17d2b1dc [diff] |
merge Merge branch 'master' of github.com:open-cloud/xos into service_permissions