Merge remote branch 'origin/fruitiex/effectinfo_nerf'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)

Trivial merge