Merge remote branch 'origin/mirceakitsune/preview_images'
authorSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:41:04 +0000 (14:41 -0500)
committerSamual <samual@xonotic.org>
Sat, 7 Jan 2012 19:41:04 +0000 (14:41 -0500)

Trivial merge