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

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

341e2aa0e066eb99a32d86e0a017014892615d9d