From: Samual <samual@xonotic.org>
Date: Mon, 26 Dec 2011 03:39:04 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~69
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a406e1b7e63e1ba26e8f59229f5410c4fa1d070d;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into samual/updatecommands
---

a406e1b7e63e1ba26e8f59229f5410c4fa1d070d