From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Fri, 6 Jun 2014 14:31:18 +0000 (-0400)
Subject: Merge branch 'master' into 2955-fail-orphan-jobs
X-Git-Tag: 1.1.0~2575^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1f760632ae0fbb9f11af5cfb831b7c3ed49a7009

Merge branch 'master' into 2955-fail-orphan-jobs
---

1f760632ae0fbb9f11af5cfb831b7c3ed49a7009