From: radhika <radhika@curoverse.com>
Date: Thu, 22 Oct 2015 17:03:18 +0000 (-0400)
Subject: Merge branch 'master' into 7167-keep-rsync
X-Git-Tag: 1.1.0~1296^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1dd5b73a66b107d16ae4ccc0e97e5b4a18caef17

Merge branch 'master' into 7167-keep-rsync
---

1dd5b73a66b107d16ae4ccc0e97e5b4a18caef17