From: Rudolf Polzer <divverent@alientrap.org>
Date: Thu, 7 Oct 2010 12:17:54 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.xonotic.org/xonotic
X-Git-Tag: xonotic-v0.1.0preview~132
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=868efd45a1a58be8a65461131a551cfa7d9d7dca

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

868efd45a1a58be8a65461131a551cfa7d9d7dca