From: Tim Pierce <twp@curoverse.com>
Date: Thu, 6 Mar 2014 23:05:48 +0000 (-0500)
Subject: Merge branch 'master' into 2221-complete-docker
X-Git-Tag: 1.1.0~2690^2~64^2~33
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/6263b4bdab2869ffc52c49ab283dd39c93f25a32

Merge branch 'master' into 2221-complete-docker
---

6263b4bdab2869ffc52c49ab283dd39c93f25a32