From: radhika <radhika@curoverse.com>
Date: Tue, 4 Aug 2015 20:20:04 +0000 (-0400)
Subject: Merge branch 'master' into 6588-documentation
X-Git-Tag: 1.1.0~1439^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5

Merge branch 'master' into 6588-documentation
---

f2f4727cf8a91e363c2a1c85e98fcdd6419abdb5