Merge remote-tracking branch 'origin/samual/no_dead_airshots'
authorRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 27 May 2011 18:49:46 +0000 (20:49 +0200)

Trivial merge