From: Tim Pierce <twp@curoverse.com>
Date: Thu, 13 Mar 2014 21:58:57 +0000 (-0400)
Subject: Merge branch 'master' into 2221-complete-docker
X-Git-Tag: 1.1.0~2690^2~64^2~17
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/76f9268395068d47fda7f34426bc83d603c834c7

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

76f9268395068d47fda7f34426bc83d603c834c7