From: Rudolf Polzer <divverent@xonotic.org>
Date: Fri, 24 Jan 2014 16:50:17 +0000 (+0100)
Subject: Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic
X-Git-Tag: xonotic-v0.8.0~42
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=195408ed3395755d1435480f7c45cfd7d0a2ba81;p=xonotic%2Fxonotic.git

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

195408ed3395755d1435480f7c45cfd7d0a2ba81