Merge branch '2755-api-collection-permissions'
authorTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 18:15:01 +0000 (14:15 -0400)
committerTim Pierce <twp@curoverse.com>
Wed, 21 May 2014 19:54:56 +0000 (15:54 -0400)
commit45216b83b108a3c48cdd8b1aaf898ccd93188507
treea76781ce64e33f7a3767bdcecea69995652b5ad0
parent1bb9f9ca3ffe077f2d90d7de65fbee37a717ef23
parent32eafceeb044696ac7db49bbe1d6329e0e3785c0
Merge branch '2755-api-collection-permissions'

closes #2784, closes #2787