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

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

c24f0eb3590dc119bc72cdb498c2fd5e94630740