From: chaoskagami <chaos.kagami@gmail.com>
Date: Thu, 1 Sep 2016 17:59:03 +0000 (-0400)
Subject: Merge branch 'master' into wip/plainconf
X-Git-Tag: v0.3.0~26
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=542b3a0611b3358aac8b3723c7bc65aeb0e798e8;p=corbenik%2Fcorbenik.git

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

542b3a0611b3358aac8b3723c7bc65aeb0e798e8