[GNUnet-SVN] [gnunet] 33/64: Merge branch 'fix_social' of gnunet.org:gnunet into fix_social

[gnunet]

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

lurchi pushed a commit to branch master
in repository gnunet.

commit 95385d9d21c25cba07f07c8cded2442415380c0e
Merge: e38ec7081 c030c80e4
Author: t3sserakt <address@hidden>
AuthorDate: Wed Nov 22 17:28:24 2017 +0100

    Merge branch 'fix_social' of gnunet.org:gnunet into fix_social

 src/include/gnunet_protocols.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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