From: Samual <samual@xonotic.org>
Date: Thu, 18 Aug 2011 07:58:57 +0000 (-0400)
Subject: Merge remote branch 'origin/master' into fruitiex/animations
X-Git-Tag: xonotic-v0.6.0~40^2~76^2~5
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ba8bed747f6303d3724c1aedb4be994b1e87455;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/master' into fruitiex/animations

Conflicts:
	defaultXonotic.cfg
---

8ba8bed747f6303d3724c1aedb4be994b1e87455