From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Wed, 14 May 2014 19:45:05 +0000 (-0400)
Subject: Merge branch 'master' into 2798-go-keep-client
X-Git-Tag: 1.1.0~2603^2~5^2~13
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/27f5c1635d56c3f3cb6c5ef069c28db939eec2a1

Merge branch 'master' into 2798-go-keep-client
---

27f5c1635d56c3f3cb6c5ef069c28db939eec2a1