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)
commit993149b9b8f1e3b5bbcd928044bd52f124b822d8
treeab1bb297557758d1a7f9e570e70bd112ca19f037
parent4067a95404b385f133ac4bdecc190bcf09b56d48
parent26e6d558f3079c1a8b9ac95e5a9868d223894039
Merge branch 'feature/shop'

I accidently commited stuff to that feature branch.