From: radhika <radhika@curoverse.com>
Date: Tue, 6 Oct 2015 17:56:12 +0000 (-0400)
Subject: Merge branch 'master' into 7167-keep-rsync-test-setup
X-Git-Tag: 1.1.0~1310^2~26^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/956c3a765e3794a291376cbb5a2ee9ec6ef4560b

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

956c3a765e3794a291376cbb5a2ee9ec6ef4560b