From: Charlie DeTar <cfd@media.mit.edu>
Date: Fri, 9 Jan 2015 21:06:25 +0000 (-0700)
Subject: Merge branch 'master' of github.com:FinalsClub/karmaworld
X-Git-Tag: release-20150131~10
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2e643caaff3e0e439b93c0e15a46ada4c79c5027;p=oweals%2Fkarmaworld.git

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

2e643caaff3e0e439b93c0e15a46ada4c79c5027