Merge branch 'preview' into wk-master
authorWerner Koch <wk@gnupg.org>
Mon, 5 Jun 2017 17:20:56 +0000 (19:20 +0200)
committerWerner Koch <wk@gnupg.org>
Mon, 5 Jun 2017 17:20:56 +0000 (19:20 +0200)
1  2 
web/donate/kudos.org
web/index.org

Simple merge
diff --cc web/index.org
Simple merge