[GNUnet-SVN] [gnunet] 04/19: Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020

[gnunet]

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

grothoff pushed a commit to branch master
in repository gnunet.

commit 99c89e00b6d288e749a10947ba7473a4beaf747d
Merge: c62b46170 28cee7516
Author: Christian Grothoff <address@hidden>
AuthorDate: Sat May 26 20:44:34 2018 +0200

    Merge branch 'h2020' of git+ssh://gnunet.org/gnunet into h2020

 src/transport/Makefile.am       | 13 +++++++++++++
 src/transport/transport.conf.in | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+)

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