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

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

3f7fd3667281a113891f7d8d1a265fde132a55fb