From: Bryan Bonvallet <btbonval@gmail.com>
Date: Mon, 19 May 2014 18:49:57 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~39
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b92759797930600fac80a3656d1906b62b8d9af1;p=oweals%2Fkarmaworld.git

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

b92759797930600fac80a3656d1906b62b8d9af1