From: Rudolf Polzer Date: Mon, 13 Sep 2010 09:11:02 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~36 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=9998c28bbc0124a7bac463211539b9497e5e1374;hp=-c Merge branch 'master' into divVerent/crypto2 --- 9998c28bbc0124a7bac463211539b9497e5e1374