]> Chaos Git - corbenik/corbenik.git/commitdiff
Merge branch 'master' into wip/plainconf wip/plainconf 42/head
authorchaoskagami <kagami@chaos.moe>
Thu, 27 Oct 2016 15:54:34 +0000 (11:54 -0400)
committerchaoskagami <kagami@chaos.moe>
Thu, 27 Oct 2016 15:54:34 +0000 (11:54 -0400)

Trivial merge