From: Seth Woodworth <seth@sethish.com>
Date: Mon, 18 Mar 2013 21:32:39 +0000 (-0400)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~496^2
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=468f699889c39aeb05f329696498d39c2bc24f5f;p=oweals%2Fkarmaworld.git

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

Conflicts:
	karmaworld/assets/css/global.css
---

468f699889c39aeb05f329696498d39c2bc24f5f