Merge remote-tracking branch 'origin/matthiaskrgr/glassx'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:18:25 +0000 (11:18 +0200)

Trivial merge