Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 19 Apr 2015 11:42:14 +0000 (13:42 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 19 Apr 2015 11:42:14 +0000 (13:42 +0200)
commit68630d8b55d688a7c7ce116951c310150aa9c166
tree9fde2d5b53634b81f6df566fcf1eb81cd1c035ba
parenteeeab4239843e716b3fd4dd259985a4cd4c487a5
parent1641ae9fd2ed9bee616396a410c6e5cf65253064
Merge branch 'maint'
gcrypt.c