From: chaoskagami <chaos.kagami@gmail.com>
Date: Sat, 15 Oct 2016 07:20:40 +0000 (-0400)
Subject: Merge branch 'master' into wip/plainconf
X-Git-Tag: v0.3.1~66^2~1
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=ae482846274da719c3e966a1dd726290a275827b;p=corbenik%2Fcorbenik.git

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

ae482846274da719c3e966a1dd726290a275827b