From: Seth Woodworth <seth@sethish.com>
Date: Tue, 29 Jan 2013 19:33:21 +0000 (-0500)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~544
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=908eec0a6ea86fb67985e1dd8650a30cd7b12cb8;p=oweals%2Fkarmaworld.git

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

908eec0a6ea86fb67985e1dd8650a30cd7b12cb8