[GNUnet-SVN] [gnunet] 04/05: Merge branch 'master' of gnunet.org:gnunet

[gnunet]

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

ng0 pushed a commit to branch master
in repository gnunet.

commit 8682c673eec5d48e5b57a58c80b538a808810ab2
Merge: 56caf2296 9c6997559
Author: Nils Gillmann <address@hidden>
AuthorDate: Wed Apr 18 21:27:49 2018 +0000

    Merge branch 'master' of gnunet.org:gnunet

 po/POTFILES.in                        | 121 +++++++++++++++++-----------------
 src/dns/dnsstub.c                     |   5 ++
 src/gns/gnunet-gns-proxy-setup-ca     |   8 +--
 src/gns/gnunet-service-gns_resolver.c |   3 +
 src/namestore/gnunet-zoneimport.c     |  10 +--
 5 files changed, 78 insertions(+), 69 deletions(-)

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