From: Bryan <btbonval@gmail.com>
Date: Wed, 15 Jan 2014 03:07:23 +0000 (-0500)
Subject: Merge branch 'django155' of github.com:FinalsClub/karmaworld into django155
X-Git-Tag: release-20150131~261
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ee0c69efffdca3e43e12f0256ae144c6d383807;p=oweals%2Fkarmaworld.git

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

2ee0c69efffdca3e43e12f0256ae144c6d383807