From: Samual <samual@xonotic.org>
Date: Sat, 7 Jan 2012 19:41:04 +0000 (-0500)
Subject: Merge remote branch 'origin/mirceakitsune/preview_images'
X-Git-Tag: xonotic-v0.6.0~4
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=dc7da23fe5ffcee05b12ace5f83d5a3c5a4095bd;p=xonotic%2Fmediasource.git

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

dc7da23fe5ffcee05b12ace5f83d5a3c5a4095bd