From: Rudolf Polzer Date: Thu, 14 Oct 2010 07:32:59 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~19 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=d663da215de9e01b6fadbd6eba65d9cbcc4e2fd6;hp=--cc Merge branch 'master' into divVerent/crypto2 --- d663da215de9e01b6fadbd6eba65d9cbcc4e2fd6