From: Rudolf Polzer Date: Sun, 19 Sep 2010 19:03:03 +0000 (+0200) Subject: Merge remote branch 'origin/master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~27 X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=24275ffedddbbb9b419951e4082dd738abc49aa4;hp=--cc Merge remote branch 'origin/master' into divVerent/crypto2 --- 24275ffedddbbb9b419951e4082dd738abc49aa4