From: Rudolf Polzer Date: Sun, 3 Oct 2010 12:57:04 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~22 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=2e181ded77e2754e651cac550b7e60fe4686bf26 Merge branch 'master' into divVerent/crypto2 --- 2e181ded77e2754e651cac550b7e60fe4686bf26