pull upstream changes from gitstatus

This commit is contained in:
romkatv 2020-03-23 09:41:24 +01:00
commit 758affe574