From: Samual <samual@xonotic.org>
Date: Sat, 7 Jan 2012 19:39:16 +0000 (-0500)
Subject: Merge remote branch 'origin/mirceakitsune/preview_images'
X-Git-Tag: xonotic-v0.6.0~188^2~16^2~3
X-Git-Url: https://de.git.xonotic.org/?a=commitdiff_plain;h=c5d2e002cfd511eaf1b1267ab49cd90161f08052;p=xonotic%2Fxonotic-data.pk3dir.git

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

c5d2e002cfd511eaf1b1267ab49cd90161f08052