From: Samual <samual@xonotic.org>
Date: Wed, 5 Oct 2011 16:42:16 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into samual/updatecommands
X-Git-Tag: xonotic-v0.6.0~188^2~28^2~262
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=99f1dbddfb16976b9cfb6ccc073e56ca64e1dddb;p=xonotic%2Fxonotic-data.pk3dir.git

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

99f1dbddfb16976b9cfb6ccc073e56ca64e1dddb