From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 11 Dec 2015 19:59:02 +0000 (-0500)
Subject: Merge branch 'master' into 7454-azure-custom-data
X-Git-Tag: 1.1.0~1191^2~4
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0662b235357dd40b5d27efd06b60044ddcec06f6

Merge branch 'master' into 7454-azure-custom-data
---

0662b235357dd40b5d27efd06b60044ddcec06f6