Merge branch 'Mirio/archer/x-force' xonotic-v0.8.0 xonotic-v0.8.1
authorMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 00:57:48 +0000 (11:57 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 13 Dec 2014 00:57:48 +0000 (11:57 +1100)

Trivial merge