From: Rudolf Polzer <divverent@xonotic.org>
Date: Sun, 13 Oct 2013 22:50:32 +0000 (+0200)
Subject: Merge branch 'master' into samual/serverlist
X-Git-Tag: xonotic-v0.8.0~256^2~4
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=60f5e26be58f996cf0262de7dd92be8166e11af8;hp=60f5e26be58f996cf0262de7dd92be8166e11af8

Merge branch 'master' into samual/serverlist
---