From: Rudolf Polzer Date: Thu, 1 Sep 2011 09:48:07 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic X-Git-Tag: xonotic-v0.5.0~9 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed2a337081e0e2c9a6349621cf895dc567cd256a;p=xonotic%2Fxonotic.git Merge branch 'master' of ssh://git.xonotic.org/xonotic --- ed2a337081e0e2c9a6349621cf895dc567cd256a