From: Rudolf Polzer Date: Mon, 26 Jul 2010 12:36:38 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~82 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=e53394c7ff1b502f9364f7983106ade802b40a11 Merge branch 'master' into divVerent/crypto2 --- e53394c7ff1b502f9364f7983106ade802b40a11