Merge remote branch 'origin/diabolik/credits-update'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 9 Dec 2010 19:59:11 +0000 (20:59 +0100)

Trivial merge