From: Bryan <btbonval@gmail.com>
Date: Fri, 17 Jan 2014 17:35:26 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~230
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=f5567ad53891a63a1b15ee0c6eaab1a9e05c76a1;p=oweals%2Fkarmaworld.git

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

f5567ad53891a63a1b15ee0c6eaab1a9e05c76a1