From: Tom Clegg <tom@curoverse.com>
Date: Sat, 3 May 2014 03:20:56 +0000 (-0400)
Subject: Merge branch '2640-folder-api' into 1970-folder-view
X-Git-Tag: 1.1.0~2596^2~11^2~18
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f263c987ad0b144393edd28f281c5b19e84fdf0b

Merge branch '2640-folder-api' into 1970-folder-view
---

f263c987ad0b144393edd28f281c5b19e84fdf0b