From: Rudolf Polzer Date: Fri, 23 Jul 2010 06:44:40 +0000 (+0200) Subject: Merge remote branch 'origin/master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~84 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=39e60744adc8ca86a8d84fa665448a24c7a25ce0 Merge remote branch 'origin/master' into divVerent/crypto2 --- 39e60744adc8ca86a8d84fa665448a24c7a25ce0