Merge branch 'master' of goat:git/dosdemo
authorJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 25 Aug 2018 04:51:11 +0000 (07:51 +0300)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Sat, 25 Aug 2018 04:51:11 +0000 (07:51 +0300)

Trivial merge