From: Samual <samual@xonotic.org>
Date: Tue, 3 Jan 2012 16:44:59 +0000 (-0500)
Subject: Merge remote branch 'origin/master' into mirceakitsune/preview_images
X-Git-Tag: xonotic-v0.6.0~188^2~16^2~3^2~2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b6116d15c9345367b982b1d9dd13d726aff03925;p=xonotic%2Fxonotic-data.pk3dir.git

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

b6116d15c9345367b982b1d9dd13d726aff03925