From: Rudolf Polzer <divVerent@xonotic.org>
Date: Mon, 20 Jun 2011 08:12:03 +0000 (+0200)
Subject: Merge remote branch 'origin/mirceakitsune/new_loading_screens'
X-Git-Tag: xonotic-v0.5.0~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0722be26fd7d7826db6e86915d7d22d484007331;p=xonotic%2Fmediasource.git

Merge remote branch 'origin/mirceakitsune/new_loading_screens'
---

0722be26fd7d7826db6e86915d7d22d484007331