[GNUnet-SVN] [gnunet] 04/04: 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 62d08e3b8cc3facfd217f24983f12b27811eaea0
Merge: 708243c5c 96caeae8b
Author: ng0 <address@hidden>
AuthorDate: Tue Sep 26 15:02:51 2017 +0000

    Merge branch 'master' of gnunet.org:gnunet

 src/util/network.c   | 16 ++++++++++++----
 src/util/scheduler.c | 14 +++++++-------
 2 files changed, 19 insertions(+), 11 deletions(-)

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