Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg
authorWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:44:05 +0000 (18:44 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:44:05 +0000 (18:44 +0200)
commit5dea40f810d3350151425e68f1016be0765e01f1
treea39146280c89fc90984de4ee01dc2ddb3018e709
parent88d8dc8d68afe83d930b171e5882459908489d3f
parent35a3ce2acf78a95fecbccfd8db0560cca24232df
Merge branch 'master' of git+ssh://playfair.gnupg.org/git/gnupg