tree d2f491be07a05e2d96b5c8b8e5a0a878f285eb22
parent 6204e0025566ad3992ce649d4f44b7e8cdde2293
parent 7d2ce2320e8efdc4a6dcbae7b329ed3f0d1cd778
author David Howells <dhowells@redhat.com> 1406062483 +0100
committer David Howells <dhowells@redhat.com> 1406062483 +0100

Merge remote-tracking branch 'integrity/next-with-keys' into keys-next

Signed-off-by: David Howells <dhowells@redhat.com>