Merge branch 'master' of ssh://gnunet.org/gnunet
authorxrs <xrs@mail36.net>
Mon, 13 Mar 2017 19:35:18 +0000 (20:35 +0100)
committerxrs <xrs@mail36.net>
Mon, 13 Mar 2017 19:35:18 +0000 (20:35 +0100)
commit9f68c9e7d383061abbc81d1590abf25cde2305fe
tree971a0188e84878f43c2074def4ac3531c73acba6
parent501c1f7794be6e8a2ea15200dbdadd4c066edb89
parent8691934f57063bfa5032f4e34836ecbcb3d761e9
Merge branch 'master' of ssh://gnunet.org/gnunet

Conflicts:
src/multicast/test_multicast_2peers.c
src/multicast/Makefile.am
src/multicast/test_multicast_2peers.c
src/multicast/test_multicast_multipeer.c