From: smea <smealum@gmail.com>
Date: Wed, 10 Dec 2014 05:49:30 +0000 (-0800)
Subject: Merge branch 'master' of github.com:smealum/ctrulib
X-Git-Tag: v0.3.0~54
X-Git-Url: https://chaos.moe/g/?a=commitdiff_plain;h=1322d44f2209442d9c14c236ee62ed4d1cca8b8a;p=corbenik%2Fctrulib.git

Merge branch 'master' of github.com:smealum/ctrulib
---

1322d44f2209442d9c14c236ee62ed4d1cca8b8a