From: Seth Woodworth <seth@sethish.com>
Date: Wed, 6 Mar 2013 23:15:20 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~505
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d49448a95ead88bb32e47e3a00298c7826200220;p=oweals%2Fkarmaworld.git

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

d49448a95ead88bb32e47e3a00298c7826200220