From: Rudolf Polzer Date: Tue, 7 Sep 2010 07:34:00 +0000 (+0200) Subject: Merge remote branch 'origin/master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~42^2 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=13a74ed2c1aab7221c7512e3040966bc47b6ca42 Merge remote branch 'origin/master' into divVerent/crypto2 --- 13a74ed2c1aab7221c7512e3040966bc47b6ca42