From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 5 Sep 2011 11:09:24 +0000 (+0200)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.5.0
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=183e53b49e93208756a5ca91aa80d81c24034b12;p=xonotic%2Fxonotic.git

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

5b4307c6a17aac239095030c527fbc76f1a0cf23