Merge branch 'master' of goat:git/laserbrain_demo
authorJohn Tsiombikas <nuclear@member.fsf.org>
Wed, 12 Sep 2018 11:56:12 +0000 (14:56 +0300)
committerJohn Tsiombikas <nuclear@member.fsf.org>
Wed, 12 Sep 2018 11:56:12 +0000 (14:56 +0300)

Trivial merge