From: MirceaKitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sat, 23 Apr 2011 01:06:08 +0000 (+0300)
Subject: Merge branch 'master' into mirceakitsune/screen_update
X-Git-Tag: xonotic-v0.5.0~11^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ecc0d5e2d71d59b4ea7d4790bfeb8313076236d6;p=xonotic%2Fmediasource.git

Merge branch 'master' into mirceakitsune/screen_update
---

ecc0d5e2d71d59b4ea7d4790bfeb8313076236d6