From: Tom Clegg <tom@curoverse.com>
Date: Tue, 17 Mar 2015 14:57:35 +0000 (-0400)
Subject: 5416: Merge branch 'master' into 5416-git-auth-token
X-Git-Tag: 1.1.0~1714^2~8
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ad69cab04c31db7ed78ced64e3e1fa814775d6d7

5416: Merge branch 'master' into 5416-git-auth-token
---

ad69cab04c31db7ed78ced64e3e1fa814775d6d7