Merge remote branch 'origin/master'
authorSamual <samual@xonotic.org>
Fri, 17 Feb 2012 20:28:00 +0000 (15:28 -0500)
committerSamual <samual@xonotic.org>
Fri, 17 Feb 2012 20:28:00 +0000 (15:28 -0500)

Trivial merge