From: Rudolf Polzer <divVerent@alientrap.org>
Date: Fri, 27 Aug 2010 08:35:06 +0000 (+0200)
Subject: Merge branch 'master' into divVerent/crypto2
X-Git-Tag: xonotic-v0.1.0preview~125^2~59
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12fe42d7f5037b53c863189c0ff45ab19042a339;p=xonotic%2Fxonotic.git

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

12fe42d7f5037b53c863189c0ff45ab19042a339