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)
1  2 
gcrypt.c

diff --cc gcrypt.c
Simple merge