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

Trivial merge