From: markus schnalke <meillo@marmaro.de>
Date: Fri, 23 Oct 2015 12:26:49 +0000 (+0200)
Subject: Merge branch 'master'
X-Git-Tag: mmh-0.2-RC1~14
X-Git-Url: http://git.marmaro.de/?a=commitdiff_plain;h=9c61a657f72aa43b4a2f4e027ad84e7f65fb66cb;p=mmh

Merge branch 'master'
---

9c61a657f72aa43b4a2f4e027ad84e7f65fb66cb