From: Charles Holbrow <charlesholbrow@gmail.com>
Date: Thu, 14 Mar 2013 14:42:59 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~500^2~3
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=272953382fe785860701f877d279b8f98638e0ff;p=oweals%2Fkarmaworld.git

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

272953382fe785860701f877d279b8f98638e0ff