From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 17 Jun 2010 12:08:52 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~422
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=a543153ec5024e471397ef0aeab6534c83469491

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

a543153ec5024e471397ef0aeab6534c83469491