From: Rudolf Polzer Date: Thu, 5 Aug 2010 04:57:01 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~73 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=11f523efd249be0dec7534ae539a6de65678379c Merge branch 'master' into divVerent/crypto2 --- 11f523efd249be0dec7534ae539a6de65678379c