Merge branch 'chilloutzone'
authorAndreas Schmitz <aschmitz@posteo.de>
Thu, 6 Feb 2014 20:33:16 +0000 (21:33 +0100)
committerAndreas Schmitz <aschmitz@posteo.de>
Thu, 6 Feb 2014 20:33:16 +0000 (21:33 +0100)

Trivial merge