Merge branch 'master' into justus/pyme3
authorJustus Winter <justus@gnupg.org>
Tue, 10 May 2016 11:03:34 +0000 (13:03 +0200)
committerJustus Winter <justus@gnupg.org>
Tue, 10 May 2016 11:03:34 +0000 (13:03 +0200)
commitf531608539b45f0bbd036f430943b390ec21aa65
tree56cf3f4db0c38e668645668ebb3dec418bed77a5
parenta7fbd5293ed0ba2c179837a4a2b859376d30e35e
parentfc38c15136c87ce971a8381fa87399088dd5a3cc
Merge branch 'master' into justus/pyme3