From: Bryan <btbonval@gmail.com>
Date: Fri, 20 Dec 2013 23:51:18 +0000 (-0500)
Subject: resolving merge conflict by adding both requirements.
X-Git-Tag: release-20150131~376
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=cffefd75a2cffa50fa7f01d34f021dadd3296d65;p=oweals%2Fkarmaworld.git

resolving merge conflict by adding both requirements.
---

cffefd75a2cffa50fa7f01d34f021dadd3296d65