From: Bryan <btbonval@gmail.com>
Date: Thu, 16 Jan 2014 04:09:54 +0000 (-0500)
Subject: weird merge problem?
X-Git-Tag: release-20150131~240
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=600c3a0ba8f652f32e568fa9b739df3df14e0219;p=oweals%2Fkarmaworld.git

weird merge problem?
---

600c3a0ba8f652f32e568fa9b739df3df14e0219