From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 23 Oct 2015 19:17:50 +0000 (-0400)
Subject: Merge branch 'master' into 7582-crunch-runner
X-Git-Tag: 1.1.0~1276^2~9
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/0fa7cd5bfdab924f316046f923aec282b699d8a1

Merge branch 'master' into 7582-crunch-runner

Conflicts:
	sdk/cli/bin/crunch-job
---

0fa7cd5bfdab924f316046f923aec282b699d8a1