Merge remote-tracking branch 'origin/ingar/alphahack_crashfix', fixes #1714
authorRudolf Polzer <divverent@xonotic.org>
Sat, 6 Jul 2013 16:59:03 +0000 (18:59 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 6 Jul 2013 16:59:03 +0000 (18:59 +0200)

Trivial merge