From: Tom Clegg <tom@curoverse.com>
Date: Mon, 22 Sep 2014 15:19:04 +0000 (-0400)
Subject: 3894: Merge branch 'master' into 3894-gem-version
X-Git-Tag: 1.1.0~2166^2~7^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c446dd845656e944c2d3f91f8d00e320c37b66a1

3894: Merge branch 'master' into 3894-gem-version
---

c446dd845656e944c2d3f91f8d00e320c37b66a1