Merge branch 'master' into cbrutail/darkzone
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Jan 2012 14:44:32 +0000 (15:44 +0100)

Trivial merge