From: Steven Bazyl <sqrrrl@gmail.com>
Date: Mon, 15 Dec 2014 21:33:28 +0000 (-0800)
Subject: Merge branch 'p7s1digital-master'
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/9b0e8d3f85d77e8b6550a26c78db26cc36020c27

Merge branch 'p7s1digital-master'
---

9b0e8d3f85d77e8b6550a26c78db26cc36020c27