Merge branch 'tzork/ents-onoff' of ssh://git.xonotic.org/xonotic-data.pk3dir into...
authorJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000 (17:43 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Tue, 28 Sep 2010 15:43:19 +0000 (17:43 +0200)

Trivial merge