From: Bryan <btbonval@gmail.com>
Date: Tue, 14 Jan 2014 22:08:30 +0000 (-0500)
Subject: Merge branch 'master' into django155
X-Git-Tag: release-20150131~268
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2ce807f394a79932c06e2a86aba870d4e18dbd42;p=oweals%2Fkarmaworld.git

Merge branch 'master' into django155
---

2ce807f394a79932c06e2a86aba870d4e18dbd42