Merge remote branch 'origin/diabolik/more-lavacolors'
authortzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)
committertzork <jakob_mg@hotmail.com>
Tue, 1 Feb 2011 04:01:53 +0000 (05:01 +0100)

Trivial merge