[GNUnet-SVN] [gnunet] 11/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 2e282a449a7c8f28f6a77be53f2af1f85bd055a7
Merge: 7b1a06992 513c56ddc
Author: xrs <address@hidden>
AuthorDate: Tue Dec 5 20:44:42 2017 +0100

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

 src/gns/gnunet-gns-proxy.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

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