Merge branch 'feature/shop'
authorWerner Koch <wk@gnupg.org>
Thu, 30 Jun 2016 09:58:51 +0000 (11:58 +0200)
committerWerner Koch <wk@gnupg.org>
Thu, 30 Jun 2016 09:58:51 +0000 (11:58 +0200)
I accidently commited stuff to that feature branch.


Trivial merge