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

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

b40fec44bad9207fb7c4bb6aa7fd22dadf3e03cc