Merge branch 'master' into diabolik/umbraplayermodel
authorRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 06:44:56 +0000 (08:44 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 10 May 2010 06:44:56 +0000 (08:44 +0200)

Trivial merge