From: Tom Clegg <tom@curoverse.com>
Date: Thu, 20 Nov 2014 15:41:00 +0000 (-0500)
Subject: Merge branch '3824-docker-fixes' refs #3824 refs #4186
X-Git-Tag: 1.1.0~1981
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/48ccafc46692ae60300039937a15c0ec6f106697?hp=5185c0d7e1d9aa8ea4abe46e4bbc0927e52e9a66

Merge branch '3824-docker-fixes' refs #3824 refs #4186
---