From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Thu, 18 Apr 2013 17:37:39 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~447^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cf1ae63c9095ffeb0eb44e386bcb5827d52fbc2b;p=oweals%2Fkarmaworld.git

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

cf1ae63c9095ffeb0eb44e386bcb5827d52fbc2b