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