From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 13 Oct 2010 19:40:52 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~20
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=22579d1d9f19436956f7a546237bc6dc79296c62;hp=22579d1d9f19436956f7a546237bc6dc79296c62

Merge branch 'master' into divVerent/crypto2

Conflicts:
	all
---