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

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

f2ee5804f965717836bbd6613d19197510a7f4af