pull upstream changes from gitstatus

This commit is contained in:
romkatv 2019-03-21 11:12:48 +01:00
commit fc178e9916