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

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

aa2247a4ad9a6a4a6a5be242a9173def1eaa6a42