Merge remote-tracking branch 'origin/cbrutail/leavefix220911'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 13:36:42 +0000 (15:36 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 3 Oct 2011 13:36:42 +0000 (15:36 +0200)

Trivial merge