From: Bryan <btbonval@gmail.com>
Date: Wed, 25 Dec 2013 06:12:11 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~366
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=70ad0f35cff7202250801c90c320df14ac65015b;p=oweals%2Fkarmaworld.git

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

70ad0f35cff7202250801c90c320df14ac65015b