From: Brett Smith <brett@curoverse.com>
Date: Mon, 7 Dec 2015 15:01:26 +0000 (-0500)
Subject: Merge branch '7829-package-licenses-wip'
X-Git-Tag: 1.1.0~1206
X-Git-Url: https://git.arvados.org/arvados.git/commitdiff_plain/1a0c39586b5c73f083b7dad4d3017c5c4ffe5bf4

Merge branch '7829-package-licenses-wip'

Refs #7829.  Closes #7914.
---

1a0c39586b5c73f083b7dad4d3017c5c4ffe5bf4