From: Nico Cesar <nico@nicocesar.com>
Date: Fri, 22 May 2015 19:32:41 +0000 (-0400)
Subject: Merge branch '6035-docker-upload-option'
X-Git-Url: https://git.arvados.org/arvados-dev.git/commitdiff_plain/1e7b6aa1f16e06b796e3ed3f66c48f38a9287a5d

Merge branch '6035-docker-upload-option'

closes #6035
---

1e7b6aa1f16e06b796e3ed3f66c48f38a9287a5d