Merge remote branch 'origin/master' into fruitiex/animations
authorSamual <samual@xonotic.org>
Sat, 20 Aug 2011 06:44:44 +0000 (02:44 -0400)
committerSamual <samual@xonotic.org>
Sat, 20 Aug 2011 06:44:44 +0000 (02:44 -0400)

Trivial merge