From: Bryan Cosca <bcosc@curoverse.com>
Date: Wed, 21 Oct 2015 15:36:25 +0000 (-0400)
Subject: Merge branch '7015-update-user-guide'
X-Git-Tag: 1.1.0~1298
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/f0ea4324260fb4dc6df693d9548285bb64b3b69f

Merge branch '7015-update-user-guide'

closes #7015
---

f0ea4324260fb4dc6df693d9548285bb64b3b69f