[GNUnet-SVN] [gnunet] 04/07: 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 9528dcc4b739041f51ed0c8791fe34902525fac2
Merge: f82b3a27d 13b340c41
Author: xrs <address@hidden>
AuthorDate: Wed Mar 1 19:24:17 2017 +0100

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

 src/consensus/gnunet-service-consensus.c | 30 ++++++++++++++++++++++++++++++
 src/set/gnunet-service-set.c             |  4 +++-
 src/set/gnunet-service-set_union.c       | 13 +++++++++++++
 src/set/set_api.c                        |  6 ++++--
 src/topology/friends.c                   | 18 ++++++++++++------
 5 files changed, 62 insertions(+), 9 deletions(-)

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