Merge remote branch 'origin/fruitiex/glowplant'
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 16:29:50 +0000 (18:29 +0200)

Trivial merge