Merge branch 'master' into STABLE-BRANCH-2-2
authorWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:41:42 +0000 (18:41 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 16 Jun 2016 16:41:42 +0000 (18:41 +0200)
commiteae301bf9c24fd17599c005ed3415450d6dce7e3
treea39146280c89fc90984de4ee01dc2ddb3018e709
parent88d8dc8d68afe83d930b171e5882459908489d3f
parent35a3ce2acf78a95fecbccfd8db0560cca24232df
Merge branch 'master' into STABLE-BRANCH-2-2

--