From: smea <smealum@gmail.com>
Date: Sun, 26 Oct 2014 20:03:49 +0000 (-0700)
Subject: Merge branch 'master' into refactor
X-Git-Tag: v0.2.0~88
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=f1633c7c5fdb017e4f5329f83ceb30ca0aa3bf99;p=corbenik%2Fctrulib.git

Merge branch 'master' into refactor
---

f1633c7c5fdb017e4f5329f83ceb30ca0aa3bf99