From: Tom Clegg <tom@curoverse.com>
Date: Sat, 17 Oct 2015 04:39:25 +0000 (-0400)
Subject: Merge branch '7173-jessie'
X-Git-Tag: 1.1.0~1306
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9385f4e8b60658460d47a1051ef0e8b3be342cba

Merge branch '7173-jessie'

closes #7173
---

9385f4e8b60658460d47a1051ef0e8b3be342cba