Merge remote branch 'origin/master' into diabolik/umbraplayermodel
authorRudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 19:42:18 +0000 (21:42 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 12 May 2010 19:42:18 +0000 (21:42 +0200)

Trivial merge