From: Peter Amstutz <peter.amstutz@curoverse.com>
Date: Mon, 23 Jun 2014 13:11:38 +0000 (-0400)
Subject: Merge branch '2986-arv-edit' closes #2986
X-Git-Tag: 1.1.0~2531
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/cdd94fae8d40ad6dcee3de5d36de2d89921fd12d?hp=--cc

Merge branch '2986-arv-edit' closes #2986
---

cdd94fae8d40ad6dcee3de5d36de2d89921fd12d