From: Tom Clegg <tom@curoverse.com>
Date: Wed, 13 Aug 2014 19:13:43 +0000 (-0400)
Subject: 3551: Merge branch 'master' into 3551-go-layout
X-Git-Tag: 1.1.0~2326^2~7
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/922da69f42998b29355796e20e4dee0079d4113e

3551: Merge branch 'master' into 3551-go-layout
---

922da69f42998b29355796e20e4dee0079d4113e