Merge remote-tracking branch 'origin/master' into credentials
authorSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
committerSchanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
commit2d81d6d8217b9aa08139bd66d14c597705568920
tree197017d2b8498a79700ef6e00160b80ae749222e
parentad5b64d8ef992d7281501297b547095569d8f0fb
parentd7547ab18052726a69ee088876389a18798e03a8
Merge remote-tracking branch 'origin/master' into credentials
configure.ac
po/POTFILES.in
src/Makefile.am
src/include/gnunet_protocols.h