From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Wed, 23 Jan 2013 21:11:34 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~549
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=adb14498e2df4f7400d2f570c5c5bbe30ba21e7a;p=oweals%2Fkarmaworld.git

Merge branch 'master' of github.com:FinalsClub/karmaworld
---

adb14498e2df4f7400d2f570c5c5bbe30ba21e7a