From: Brett Smith <brett@curoverse.com>
Date: Mon, 26 Oct 2015 18:46:57 +0000 (-0400)
Subject: Merge branch 'pr/25'
X-Git-Tag: 1.1.0~1290
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/d0f91b34eedec9af266ec4877a3005dd627ad38e

Merge branch 'pr/25'

Closes #7307.
---

d0f91b34eedec9af266ec4877a3005dd627ad38e