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

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

5c4a4f41a4777036282d8195f43598f74d04af4f