From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 3 Sep 2010 07:08:18 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~50
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=cb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6;hp=cb2a4b93c1c72c8eb8d3d7cdd3b19947893d73e6

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---