From: chaoskagami <kagami@chaos.moe>
Date: Thu, 27 Oct 2016 15:54:34 +0000 (-0400)
Subject: Merge branch 'master' into wip/plainconf
X-Git-Tag: v0.3.1~66^2
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=refs%2Fpull%2F42%2Fhead;p=corbenik%2Fcorbenik.git

Merge branch 'master' into wip/plainconf
---

279f29e1ead62d8072ec00e20ac1ae5fed00283a