From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Thu, 21 Mar 2013 21:34:14 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~474
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51094162e892368dbe28f67379dac2c012d67f78;p=oweals%2Fkarmaworld.git

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

51094162e892368dbe28f67379dac2c012d67f78