From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 5 Aug 2010 08:41:38 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~329^2~22
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=d8d1cd7183a8cd18961fd4f36b38429e0a31327d;p=xonotic%2Fxonotic.git

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

d8d1cd7183a8cd18961fd4f36b38429e0a31327d