Merge branch 'master' of goat:git/vrfileman
authorJohn Tsiombikas <nuclear@mutantstargoat.com>
Wed, 3 Aug 2016 06:22:07 +0000 (09:22 +0300)
committerJohn Tsiombikas <nuclear@mutantstargoat.com>
Wed, 3 Aug 2016 06:22:07 +0000 (09:22 +0300)

Trivial merge