[git] gnupg-doc - branch, master, updated. 615025b52ac8ab7130240266439b4a6a678ed69f

[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  615025b52ac8ab7130240266439b4a6a678ed69f (commit)
      from  2adb2557b87eb05afe307c2acd6a245501f26f87 (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 615025b52ac8ab7130240266439b4a6a678ed69f
Author: Werner Koch <wk at gnupg.org>
Date:   Wed Mar 1 07:17:43 2017 +0100

    web: Marcus is back

diff --git a/web/people/index.org b/web/people/index.org
index 6952043..341e613 100644
--- a/web/people/index.org
+++ b/web/people/index.org
@@ -56,13 +56,13 @@
    #+HTML: <p><img src="marcus.png" title="Marcus Brinkmann" /></p>
    #+HTML: </div>
 
-   /Hacker emeritus/
+   /Hacker/
 
    Marcus is part of the free software community since 1997, when he
    joined the [[http://www.debian.org][Debian]] project.  Probably best known for his past work
-   on GNU/Hurd, he also has a diploma degree in mathematics, and was
+   on GNU/Hurd, he also has a diploma degree in mathematics, and is
    employed by [[https://g10code.com][g10^code]] to work on the GnuPG and related software from
-   2001 to 2012.
+   2001 to 2012 and again since 2017.
 
    #+HTML: <p style="clear: both"/>
 

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

Summary of changes:
 web/people/index.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


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