Merge branch 'keys-blacklist' into keys-next
authorDavid Howells <dhowells@redhat.com>
Mon, 3 Apr 2017 16:17:09 +0000 (17:17 +0100)
committerDavid Howells <dhowells@redhat.com>
Mon, 3 Apr 2017 16:17:09 +0000 (17:17 +0100)

Trivial merge