From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Tue, 3 Jan 2012 16:56:41 +0000 (+0200)
Subject: Merge branch 'mirceakitsune/preview_images' of git://de.git.xonotic.org/xonotic/xonot... 
X-Git-Tag: xonotic-v0.6.0~188^2~16^2~3^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4e74b14c22b31c92b2770720ed3c5944299ae93b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'mirceakitsune/preview_images' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir into mirceakitsune/preview_images
---

4e74b14c22b31c92b2770720ed3c5944299ae93b