[GNUnet-SVN] [gnunet] 02/05: -Merge branch 'master' into identity_oidc

[gnunet]

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

martin-schanzenbach pushed a commit to branch master
in repository gnunet.

commit 699ff34b7203eb99d7ff1a45ff6b8309676c1102
Merge: 2363773d8 56a9d4001
Author: Phil <address@hidden>
AuthorDate: Mon Feb 26 17:02:29 2018 +0100

    -Merge branch 'master' into identity_oidc

 AUTHORS                                      |  10 +-
 contrib/gns-bcd.tex                          |   1 -
 doc/documentation/chapters/developer.texi    |  78 +++--
 doc/documentation/chapters/installation.texi |  17 +-
 doc/documentation/chapters/user.texi         |  34 +-
 doc/documentation/index.html                 |  93 +++--
 src/consensus/gnunet-service-consensus.c     |   2 +-
 src/datastore/plugin_datastore_sqlite.c      |  13 +
 src/exit/gnunet-daemon-exit.c                |   4 +-
 src/gns/Makefile.am                          |   2 +-
 src/gns/gnunet-service-gns.c                 | 133 +++++++-
 src/gns/gnunet-service-gns.h                 |  41 +++
 src/gns/gnunet-service-gns_interceptor.c     |   4 +-
 src/gns/gnunet-service-gns_resolver.c        |   7 +-
 src/include/gnunet_scheduler_lib.h           | 196 +++++++----
 src/multicast/gnunet-service-multicast.c     |  26 +-
 src/psyc/gnunet-service-psyc.c               |  22 +-
 src/rps/gnunet-service-rps.c                 |  28 +-
 src/rps/rps-test_util.h                      |   2 +-
 src/rps/test_rps.c                           | 104 ++++--
 src/social/gnunet-service-social.c           |  31 +-
 src/util/mq.c                                |   4 +-
 src/util/scheduler.c                         | 491 ++++++++++++++++-----------
 23 files changed, 925 insertions(+), 418 deletions(-)

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