From: Brett Smith <brett@curoverse.com>
Date: Fri, 30 May 2014 14:45:02 +0000 (-0400)
Subject: Merge branch '2752-arv-put-resume'
X-Git-Tag: 1.1.0~2587^2~1
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/ffe3cdbc8c37e2b4a4e3ea4f67c1c9ca5d81e2ed

Merge branch '2752-arv-put-resume'

Closes #2752, #2864.
---

ffe3cdbc8c37e2b4a4e3ea4f67c1c9ca5d81e2ed