Merge branch 'divVerent/fruitbalance' of ssh://git.xonotic.org/xonotic-data.pk3dir...
authorRudolf Polzer <divverent@alientrap.org>
Mon, 19 Jul 2010 10:55:25 +0000 (12:55 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 19 Jul 2010 10:55:25 +0000 (12:55 +0200)

Trivial merge