From: Rudolf Polzer Date: Thu, 12 Aug 2010 04:33:49 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~69 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7a8e91cdc377e7a7407f34a85a515e6a7986f3f2;p=xonotic%2Fxonotic.git Merge branch 'master' into divVerent/crypto2 --- 7a8e91cdc377e7a7407f34a85a515e6a7986f3f2