Merge branch 'master' into LIBGCRYPT-1-7-BRANCH
authorWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 09:19:22 +0000 (11:19 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 14 Jul 2016 09:19:22 +0000 (11:19 +0200)
commit5a4cbc5256e493563eb82a9bb73f22fe4d413579
tree15156c19d777407a4556f3d2e74fa850fb17ebb5
parentb0b70e7fe37b1bf13ec0bfc8effcb5c7f5db6b7d
parent2b26de65e61dc42c64120c463a33e944bf413e28
Merge branch 'master' into LIBGCRYPT-1-7-BRANCH