Merge branch 'master' into LIBGCRYPT-1-7-BRANCH
authorWerner Koch <wk@gnupg.org>
Wed, 15 Jun 2016 07:24:02 +0000 (09:24 +0200)
committerWerner Koch <wk@gnupg.org>
Wed, 15 Jun 2016 07:24:02 +0000 (09:24 +0200)
commit33b6637a56231f66792fb66ff30a0c4145bfac68
treefdecc92bc74de1b5557f21c2053f09507734cc71
parent6cc2100c00a65dff07b095dea7b32cb5c5cd96d4
parentc3173bbe3f1a9c73f81a538dd49ccfa0447bfcdc
Merge branch 'master' into LIBGCRYPT-1-7-BRANCH

--