From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 6 Aug 2010 06:37:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~325
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=40df4863a43c30b2fdabc36d408d4283c12c8d7c;hp=-c

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

40df4863a43c30b2fdabc36d408d4283c12c8d7c