Merge branch 'keys-misc' into keys-next

Miscellaneous keyrings changes.

Signed-off-by: David Howells <dhowells@redhat.com>
This commit is contained in:
David Howells 2016-04-12 20:09:34 +01:00
commit 6e007f3186
11 changed files with 428 additions and 50 deletions