[GNUnet-SVN] [gnunet] 02/04: 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 c29843536859d46d68f5122f754cadbea5aa9b40
Merge: cfb311ede dcf86b6d0
Author: xrs <address@hidden>
AuthorDate: Tue Jul 4 00:29:19 2017 +0200

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

 src/multicast/test_multicast.conf | 2 +-
 src/set/set_api.c                 | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)


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