Merge branch 'master' of goat:git/dosdemo
authorJohn Tsiombikas <nuclear@mutantstargoat.com>
Wed, 19 Oct 2016 20:56:47 +0000 (23:56 +0300)
committerJohn Tsiombikas <nuclear@mutantstargoat.com>
Wed, 19 Oct 2016 20:56:47 +0000 (23:56 +0300)

Trivial merge