From: Jan Behrens <zykure@web.de>
Date: Sun, 27 Jan 2013 17:57:16 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
X-Git-Tag: xonotic-v0.7.0~23^2~14
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3aa63c6febb90af279ac168b8c50dc0981e9f903;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir

Conflicts:
	qcsrc/server/playerstats.qc
---

3aa63c6febb90af279ac168b8c50dc0981e9f903