Merge branch 'master' of ssh://r-36.net:443/srv/git/catpoint - catpoint

commit 12e7c074bcbeab0017acd019a4b6c8ec42bbb63b
parent 784da2eb63697fff18243c3c1f0e3432b4240c69
Author: Christoph Lohmann <20h@r-36.net>
Date:   Tue,  5 May 2020 13:14:37 +0200

Merge branch 'master' of ssh://r-36.net:443/srv/git/catpoint

	catpoint Catpoint simple presenting software.
	git clone git://r-36.net/catpoint
	Log \| Files \| Refs \| LICENSE