From: Rudolf Polzer <divverent@alientrap.org>
Date: Sat, 11 Sep 2010 00:23:55 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~229
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=384844611417877563bacf070ad8fd10acc4a1e6;hp=-c

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

384844611417877563bacf070ad8fd10acc4a1e6