Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 1 Dec 2016 16:05:29 +0000 (17:05 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Thu, 1 Dec 2016 16:05:29 +0000 (17:05 +0100)
commit540d02ea89df5e41cf81776c18440c67a0a494b8
tree5045e05ef52a59c1ead72297ba61102c7e055d9f
parent7356e4ff0c881ce1f9eb053d6a8a5866fb2179dc
parent1583915a015aa6387b7f387df2f43f3d34a6dfb0
Merge remote-tracking branch 'origin/master' into credentials
configure.ac
src/include/gnunet_protocols.h