From: Philipp Schüle <p.schuele@metaways.de>
Date: Thu, 15 Sep 2016 08:14:39 +0000 (+0200)
Subject: Merge branch '2015.11-develop' into 2016.11
X-Git-Tag: 2016.09.1~1^2^2
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=bef3153b5ae52499096fda5558bc435d05581ee5

Merge branch '2015.11-develop' into 2016.11
---

bef3153b5ae52499096fda5558bc435d05581ee5