Merge branch 'master' into mirio/glowplant
authorMirio <opivy@hotmail.de>
Thu, 19 Jun 2014 01:21:34 +0000 (03:21 +0200)
committerMirio <opivy@hotmail.de>
Thu, 19 Jun 2014 01:21:34 +0000 (03:21 +0200)

Trivial merge