From: Rudolf Polzer <rpolzer@grawp.(none)>
Date: Fri, 2 Apr 2010 12:25:03 +0000 (+0200)
Subject: Merge commit 'origin/esteel/renames'
X-Git-Tag: xonotic-v0.1.0preview~519
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5d21c011d874c70159ac70f2e4435c57c16a9c3e;p=xonotic%2Fxonotic.git

Merge commit 'origin/esteel/renames'

Conflicts:
	server/readme.txt
---

5d21c011d874c70159ac70f2e4435c57c16a9c3e