Merge remote branch 'origin/fruitiex/gamemode_freezetag'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 2 Jan 2011 18:06:04 +0000 (19:06 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 2 Jan 2011 18:06:04 +0000 (19:06 +0100)

Trivial merge