From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 18 May 2015 20:50:36 +0000 (-0400)
Subject: Merge branch 'master' into 3198-writable-fuse
X-Git-Tag: 1.1.0~1503^2~25
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/28e6503a62fbbff41224843c8c39f4052242c8cd

Merge branch 'master' into 3198-writable-fuse
---

28e6503a62fbbff41224843c8c39f4052242c8cd