From: Rudolf Polzer <divverent@alientrap.org>
Date: Wed, 13 Oct 2010 16:49:17 +0000 (+0200)
Subject: Merge remote branch 'origin/fruitiex/loadblackbg'
X-Git-Tag: xonotic-v0.1.0preview~307^2~5^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=061a3f12e04349b8dc6e05c8d13caa4b4df95136;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote branch 'origin/fruitiex/loadblackbg'
---

061a3f12e04349b8dc6e05c8d13caa4b4df95136