From: Rudolf Polzer <divVerent@xonotic.org>
Date: Thu, 1 Sep 2011 09:54:15 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.5.0~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8178eb63b575c94418c9929a2f59e0b116763b50;p=xonotic%2Fxonotic.git

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

8178eb63b575c94418c9929a2f59e0b116763b50