From: Charles Connell <charles@connells.org>
Date: Mon, 14 Apr 2014 20:08:13 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~144
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f297ef5f99c72150d8bc3908fa1ec59ed49c06c8;p=oweals%2Fkarmaworld.git

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

f297ef5f99c72150d8bc3908fa1ec59ed49c06c8