Merge branch 'master' into key-storage-work key-storage-work
[gnupg.git] / am /
drwxr-xr-x   ..
-rw-r--r-- 2500 cmacros.am