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)

Trivial merge