Merge remote-tracking branch 'origin/master' into credentials

author Schanzenbach, Martin <mschanzenbach@posteo.de>

Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)

committer Schanzenbach, Martin <mschanzenbach@posteo.de>

Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
author Schanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
committer Schanzenbach, Martin <mschanzenbach@posteo.de>
Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
diff --cc configure.ac
Simple merge
diff --cc po/POTFILES.in
Simple merge
diff --cc src/Makefile.am
Simple merge
diff --cc src/include/gnunet_protocols.h
Simple merge
author	Schanzenbach, Martin <mschanzenbach@posteo.de>
	Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
committer	Schanzenbach, Martin <mschanzenbach@posteo.de>
	Fri, 23 Jun 2017 18:39:27 +0000 (20:39 +0200)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
po/POTFILES.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
src/include/gnunet_protocols.h	patch \|	diff1 \|	diff2 \|	blob \| history