From: Rudolf Polzer Date: Sat, 4 Sep 2010 16:41:13 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~45 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f85978ecbd5855c5128a37f68b8f364da251fa14 Merge branch 'master' into divVerent/crypto2 --- f85978ecbd5855c5128a37f68b8f364da251fa14