[GNUnet-SVN] [gnunet] 09/14: Merge branch 'master' of ssh://gnunet.org/gnunet

[gnunet]

This is an automated email from the git hooks/post-receive script.

xrs pushed a commit to branch master
in repository gnunet.

commit 84405db3a54623c59f485d3f11c506a0783595dc
Merge: bcc38ce02 862e488e0
Author: xrs <address@hidden>
AuthorDate: Wed Nov 29 20:32:41 2017 +0100

    Merge branch 'master' of ssh://gnunet.org/gnunet

 contrib/packages/guix/gnunet-doc.scm         |   2 +-
 doc/.gitignore                               |   3 +-
 doc/documentation/Makefile.am                |   6 +
 doc/documentation/README.txt                 |  30 ++
 doc/documentation/chapters/contributing.texi | 102 +++++
 doc/documentation/chapters/developer.texi    | 307 +++++++-------
 doc/documentation/chapters/installation.texi | 611 +++++++++++++++------------
 doc/documentation/chapters/philosophy.texi   | 217 ++++++----
 doc/documentation/chapters/user.texi         |  44 +-
 doc/documentation/chapters/vocabulary.texi   |  19 +-
 doc/documentation/gnunet.texi                | 109 ++---
 doc/documentation/index.html                 |  12 +-
 doc/documentation/run-gendocs.sh             |   2 +-
 src/cadet/gnunet-service-cadet_paths.c       |   4 +-
 src/social/social_api.c                      |   2 +
 src/transport/gnunet-service-transport_ats.c |   3 +-
 16 files changed, 887 insertions(+), 586 deletions(-)

-- 
To stop receiving notification emails like this one, please contact
address@hidden