From: chaoskagami <chaos.kagami@gmail.com>
Date: Fri, 15 Jul 2016 02:54:47 +0000 (-0400)
Subject: Merge branch 'master' into ctr9io_crypto
X-Git-Tag: v0.2.0~22
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=refs%2Fheads%2Fctr9io_crypto;p=corbenik%2Fcorbenik.git

Merge branch 'master' into ctr9io_crypto
---

0fc7345fb665b7bff62c1eb41aea0dcd243a052e