Merge remote branch 'origin/master' into mirceakitsune/preview_images
authorSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)
committerSamual <samual@xonotic.org>
Tue, 3 Jan 2012 16:44:07 +0000 (11:44 -0500)

Trivial merge