From: mtheall <pigman46@gmail.com>
Date: Fri, 23 Jan 2015 21:07:44 +0000 (-0600)
Subject: Merge branch 'master' into utf
X-Git-Tag: v0.4.0~1^2~1
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=7e58d84a3757332469214d6ce44073cea43da3cf;p=corbenik%2Fctrulib.git

Merge branch 'master' into utf
---

7e58d84a3757332469214d6ce44073cea43da3cf