Merge branch 'master' of gnunet.org:gnunet

author tg(x) <*@tg-x.net>

Fri, 24 Feb 2017 19:10:46 +0000 (20:10 +0100)

committer tg(x) <*@tg-x.net>

Fri, 24 Feb 2017 19:10:46 +0000 (20:10 +0100)
author tg(x) <*@tg-x.net>
Fri, 24 Feb 2017 19:10:46 +0000 (20:10 +0100)
committer tg(x) <*@tg-x.net>
Fri, 24 Feb 2017 19:10:46 +0000 (20:10 +0100)
diff --cc src/util/mq.c
Simple merge
diff --cc src/util/os_installation.c
Simple merge
diff --cc src/util/service_new.c
Simple merge