From: Bryan <btbonval@gmail.com>
Date: Fri, 17 Jan 2014 05:33:47 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin' into feature_html_on_s3
X-Git-Tag: release-20150131~232
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=5319934e6c4e808a59deab3d0ef21253525f2b85;p=oweals%2Fkarmaworld.git

Merge remote-tracking branch 'origin' into feature_html_on_s3
---

5319934e6c4e808a59deab3d0ef21253525f2b85