Merge branch 'key-fingerprints'
authorStef Walter <stefw@collabora.co.uk>
Tue, 24 May 2011 07:37:21 +0000 (09:37 +0200)
committerStef Walter <stefw@collabora.co.uk>
Tue, 24 May 2011 07:37:21 +0000 (09:37 +0200)
commit9d3ad04deff9e25e49812857e4461ca7f263cf13
treec95620e37bd1c4d65848afee1f745cab99a39723
parent2dcd037ac4919cdcfa5ca0e76c69c0c0197cbe91
parent6df0c53e32acbc42f1658a28e65f62cd28aeeff4
Merge branch 'key-fingerprints'

Conflicts:
gcr/Makefile.am
gcr/Makefile.am
gcr/tests/Makefile.am