From: radhika <radhika@curoverse.com>
Date: Fri, 31 Jul 2015 15:36:28 +0000 (-0400)
Subject: Merge branch 'master' into 6588-documentation
X-Git-Tag: 1.1.0~1439^2~3
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6870192ada3c34ffe5f0dc4c33ce2ad55bc2d263

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

6870192ada3c34ffe5f0dc4c33ce2ad55bc2d263