From: radhika <radhika@curoverse.com>
Date: Thu, 22 May 2014 15:21:53 +0000 (-0400)
Subject: Merge branch 'master' into 2767-doc-updates
X-Git-Tag: 1.1.0~2612
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/49a6ced3c7a540a7da7155ab1c3120a5227c620c

Merge branch 'master' into 2767-doc-updates
---

49a6ced3c7a540a7da7155ab1c3120a5227c620c