From: Philipp Schüle <p.schuele@metaways.de>
Date: Wed, 10 Aug 2016 16:26:11 +0000 (+0200)
Subject: Merge branch '2015.11' into 2015.11-develop
X-Git-Tag: 2016.03.5~2^2~1
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=1783cf7a8235c2db94bb4856ed5e7201325751dc

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

1783cf7a8235c2db94bb4856ed5e7201325751dc