From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 27 Aug 2010 19:33:30 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~257
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=7ca04525144b6d7c3c89bdac75cb4a239823ae6f

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

7ca04525144b6d7c3c89bdac75cb4a239823ae6f