From: mishaz <misha@curoverse.com>
Date: Tue, 19 May 2015 17:16:43 +0000 (+0000)
Subject: Merge branch 'master' into 3408-production-datamanager
X-Git-Tag: 1.1.0~1505^2~13
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6eb3d1fb8fe71623fa63da46c250184cf2e4fbb8

Merge branch 'master' into 3408-production-datamanager
Because it's been a long time.
---

6eb3d1fb8fe71623fa63da46c250184cf2e4fbb8