Merge branch 'cleanup'

author volpol <volpol@packet-gain.de>

Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)

committer volpol <volpol@packet-gain.de>

Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)
author volpol <volpol@packet-gain.de>
Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)
committer volpol <volpol@packet-gain.de>
Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)
diff --cc Makefile
Simple merge
diff --cc telemetry.cpp
Simple merge
author	volpol <volpol@packet-gain.de>
	Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)
committer	volpol <volpol@packet-gain.de>
	Thu, 25 Jul 2019 21:08:49 +0000 (23:08 +0200)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
telemetry.cpp	patch \|	diff1 \|	diff2 \|	blob \| history