Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh
authormarkus schnalke <meillo@marmaro.de>
Sat, 29 Aug 2015 08:48:22 +0000 (10:48 +0200)
committermarkus schnalke <meillo@marmaro.de>
Sat, 29 Aug 2015 08:48:22 +0000 (10:48 +0200)

Trivial merge