From: chaoskagami <chaos.kagami@gmail.com>
Date: Tue, 27 Sep 2016 05:00:48 +0000 (-0400)
Subject: Merge branch 'wip/plainconf' of github.com:chaoskagami/corbenik into wip/plainconf
X-Git-Tag: v0.3.0~6
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=345f2dbb2d244a4030c1e8ce82b76f1bf8f749a2;p=corbenik%2Fcorbenik.git

Merge branch 'wip/plainconf' of github.com:chaoskagami/corbenik into wip/plainconf
---

345f2dbb2d244a4030c1e8ce82b76f1bf8f749a2