From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 17 Sep 2010 19:18:39 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~202^2~12
X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=85dfd7134e95b1a66c0720b34ed0a13cecb8ffee;hp=-c

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

85dfd7134e95b1a66c0720b34ed0a13cecb8ffee