Merge branch 'spdx-list-3.0'
authorW. Trevor King <wking@tremily.us>
Wed, 3 Jan 2018 18:53:53 +0000 (10:53 -0800)
committerW. Trevor King <wking@tremily.us>
Wed, 3 Jan 2018 18:53:53 +0000 (10:53 -0800)
* spdx-list-3.0:
  pull: Convert 'uri' to the plural 'uris'
  pull: Update to the SPDX License List 3.0


Trivial merge