From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Mon, 14 Jan 2013 23:53:36 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~560
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7beb314be3ea1f13400aef5232b8143afa7cd252;p=oweals%2Fkarmaworld.git

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

7beb314be3ea1f13400aef5232b8143afa7cd252