From: Rudolf Polzer <divverent@alientrap.org>
Date: Mon, 2 Aug 2010 14:02:19 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~78
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=438729082372093824eb8f33f33d006540d2713e

Merge branch 'master' into divVerent/crypto2
---

438729082372093824eb8f33f33d006540d2713e