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

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

2f42eeabfd3a71a2cdbdb1475bc34bdeb80700cb