From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 20 Feb 2012 12:09:20 +0000 (+0100)
Subject: Merge branch 'master' of /var/cache/git/xonotic/xonotic
X-Git-Tag: xonotic-v0.6.0~26
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=df785acadc96e0bb2d5d532a5fd2222ea9c55e06;p=xonotic%2Fxonotic.git

Merge branch 'master' of /var/cache/git/xonotic/xonotic

Conflicts:
	misc/tools/xonotic-map-compiler-autobuild
---

df785acadc96e0bb2d5d532a5fd2222ea9c55e06