From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 4 Aug 2010 19:32:21 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~338
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=47c41285378461ea3aaffcb0e5d6f2df2c771185

Merge branch 'master' of ssh://git.xonotic.org/xonotic
---

47c41285378461ea3aaffcb0e5d6f2df2c771185