From: chaoskagami <chaos.kagami@gmail.com>
Date: Fri, 14 Oct 2016 08:25:02 +0000 (-0400)
Subject: Merge branch 'master' into wip/plainconf
X-Git-Tag: v0.3.1~66^2~8
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=bd00f3407027cbee938f00ffe78fa9be9ce61ac5;p=corbenik%2Fcorbenik.git

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

bd00f3407027cbee938f00ffe78fa9be9ce61ac5