From: Rudolf Polzer <divverent@xonotic.org>
Date: Sat, 6 Aug 2011 18:26:01 +0000 (+0200)
Subject: Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.5.0~45
X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=bf55dfddb5544be8b8b49d02f11ca3a5e383a93f;p=xonotic%2Fxonotic.git

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

bf55dfddb5544be8b8b49d02f11ca3a5e383a93f