From: Tim Pierce <twp@curoverse.com>
Date: Wed, 21 May 2014 18:15:01 +0000 (-0400)
Subject: Merge branch '2755-api-collection-permissions'
X-Git-Tag: 1.1.0~2612^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/45216b83b108a3c48cdd8b1aaf898ccd93188507

Merge branch '2755-api-collection-permissions'

closes #2784, closes #2787
---

45216b83b108a3c48cdd8b1aaf898ccd93188507