Merge branch 'master' of /RAM/proj/gnunet
authorCarlo von lynX <lynX@time.to.get.psyced.org>
Mon, 8 Aug 2016 19:51:46 +0000 (19:51 +0000)
committerCarlo von lynX <lynX@time.to.get.psyced.org>
Mon, 8 Aug 2016 19:51:46 +0000 (19:51 +0000)
commit06f44db8a9a4c1b6b4a2a4a707067feb7164e609
tree70d992450fe010e5ef8c2fd8882b745bb8841772
parent86a3fcdd55ad2cb221fbc2d495a90def1532b01a
Merge branch 'master' of /RAM/proj/gnunet
src/cadet/gnunet-cadet.c
src/cadet/gnunet-service-cadet_local.c
src/include/gnunet_common.h
src/util/common_logging.c