From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Mon, 25 Mar 2013 18:04:45 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~469
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=487be4b1f58873f2d533b7b150057cbacfd683ba;p=oweals%2Fkarmaworld.git

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

487be4b1f58873f2d533b7b150057cbacfd683ba