Merge remote branch 'origin/fruitiex/freezetag_vs_keepaway'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:07:31 +0000 (16:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 30 Nov 2010 15:07:31 +0000 (16:07 +0100)

Trivial merge