From: Samual <samual@xonotic.org>
Date: Mon, 24 Oct 2011 00:06:14 +0000 (-0400)
Subject: Merge remote branch 'origin/samual/add_eventlog_reporting'
X-Git-Tag: xonotic-v0.6.0~40^2~19
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=bc69db0a061dd2ff086d50bfd9dc57ad20fb0cf3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/samual/add_eventlog_reporting'
---

bc69db0a061dd2ff086d50bfd9dc57ad20fb0cf3