From: Philipp Schüle <p.schuele@metaways.de>
Date: Wed, 26 Oct 2016 12:46:53 +0000 (+0200)
Subject: Merge branch '2015.11-develop' into 2016.11
X-Git-Tag: 2016.09.4^2~3^2~5
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=cf1d0f7d8a363c1e72326eb836baad5e3986e462

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

cf1d0f7d8a363c1e72326eb836baad5e3986e462