Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:14:16 +0000 (20:14 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 18:14:16 +0000 (20:14 +0200)

Trivial merge