From: Rudolf Polzer <divverent@xonotic.org>
Date: Thu, 1 Mar 2012 13:09:54 +0000 (+0100)
Subject: Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.6.0~11
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=49de16c6f7d242cb8ea16223bb0bf3c747ae56b8;p=xonotic%2Fxonotic.git

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

49de16c6f7d242cb8ea16223bb0bf3c747ae56b8