From: Tim Pierce <twp@curoverse.com>
Date: Tue, 11 Mar 2014 14:13:25 +0000 (-0400)
Subject: Merge branch 'master' into 2221-complete-docker
X-Git-Tag: 1.1.0~2690^2~64^2~26
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/c8060b94c485d5bf0e500d2321793cd56db4c856

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

c8060b94c485d5bf0e500d2321793cd56db4c856