From: chaoskagami <chaos.kagami@gmail.com>
Date: Thu, 9 Jun 2016 21:14:28 +0000 (-0400)
Subject: Merge branch 'master' into resize
X-Git-Tag: v0.0.8~4
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=6f5a80c65985a0f9c586f8bad61fdc51a7337601;p=corbenik%2Fcorbenik.git

Merge branch 'master' into resize
---

6f5a80c65985a0f9c586f8bad61fdc51a7337601