Merge remote branch 'origin/fruitiex/cl_gentle_damage'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:39:48 +0000 (12:39 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 19 Nov 2010 11:39:48 +0000 (12:39 +0100)

Trivial merge