From: Philipp Schüle <p.schuele@metaways.de>
Date: Mon, 9 May 2016 12:02:00 +0000 (+0200)
Subject: Merge branch '2014.11' into 2015.11
X-Git-Tag: 2016.03.3~10^2^2
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=66388dd5865ba267ac1963f323bf4112426f7be5

Merge branch '2014.11' into 2015.11
---

66388dd5865ba267ac1963f323bf4112426f7be5