Merge branch 'master' of ssh://marmaro.de:443/var/git/mmh
authormarkus schnalke <meillo@marmaro.de>
Fri, 21 Nov 2014 11:06:40 +0000 (12:06 +0100)
committermarkus schnalke <meillo@marmaro.de>
Fri, 21 Nov 2014 11:06:40 +0000 (12:06 +0100)

Trivial merge