Merge branch 'chilloutzone'
authorAndreas Schmitz <aschmitz@posteo.de>
Thu, 6 Feb 2014 10:49:38 +0000 (11:49 +0100)
committerAndreas Schmitz <aschmitz@posteo.de>
Thu, 6 Feb 2014 10:49:38 +0000 (11:49 +0100)

Trivial merge