From: radhika <radhika@curoverse.com>
Date: Thu, 15 Oct 2015 16:35:15 +0000 (-0400)
Subject: Merge branch 'master' into 7167-keep-rsync
X-Git-Tag: 1.1.0~1310^2
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/db868a3c02cb84f068de77b438b4f2cb498826ae

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

db868a3c02cb84f068de77b438b4f2cb498826ae