From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 6 Aug 2010 20:47:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~323
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6cbc3a19b806847a2d4510306e2943ad48bd5e94

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

6cbc3a19b806847a2d4510306e2943ad48bd5e94