Merge remote-tracking branch 'origin/Mirio/campaign'
authorSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:58:32 +0000 (11:58 -0400)
committerSamual Lenks <samual@xonotic.org>
Fri, 31 May 2013 15:58:32 +0000 (11:58 -0400)

Trivial merge