Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 25 Jan 2017 12:51:39 +0000 (13:51 +0100)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Wed, 25 Jan 2017 12:51:39 +0000 (13:51 +0100)
commit59d393a1124cfd1aaffdf994bf6f8a9baaac8361
tree1c0d9204813ca26d6db0f35c9287f81c2a2efe74
parent3cb90c74c5f591fd2541d154a8e7b05a1c2f4539
parentf27982470b7d56cd83f5abfc1befa69bc20d952b
Merge remote-tracking branch 'origin/master' into credentials
src/include/gnunet_protocols.h