Merge remote branch 'origin/fruitiex/xpm_stepheight_26'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:30:55 +0000 (08:30 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 3 Dec 2010 07:30:55 +0000 (08:30 +0100)

Trivial merge