From: Bryan <btbonval@gmail.com>
Date: Mon, 6 Jan 2014 23:58:17 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/master'
X-Git-Tag: release-20150131~302
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=4b743a7dd59c931857fc8ee6831a0e99f6485ecd;p=oweals%2Fkarmaworld.git

Merge remote-tracking branch 'origin/master'
---

4b743a7dd59c931857fc8ee6831a0e99f6485ecd