[git] gnupg-doc - branch, master, updated. 993149b9b8f1e3b5bbcd928044bd52f124b822d8

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GnuPG website and other docs".

The branch, master has been updated
       via  993149b9b8f1e3b5bbcd928044bd52f124b822d8 (commit)
       via  26e6d558f3079c1a8b9ac95e5a9868d223894039 (commit)
      from  4067a95404b385f133ac4bdecc190bcf09b56d48 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 993149b9b8f1e3b5bbcd928044bd52f124b822d8
Merge: 4067a95 26e6d55
Author: Werner Koch <wk at gnupg.org>
Date:   Thu Jun 30 11:58:51 2016 +0200

    Merge branch 'feature/shop'
    
    I accidently commited stuff to that feature branch.


-----------------------------------------------------------------------

Summary of changes:
 web/faq/whats-new-in-2.1.org | 15 +++++++++++++++
 1 file changed, 15 insertions(+)


hooks/post-receive
-- 
The GnuPG website and other docs
http://git.gnupg.org