From: Philipp Schüle <p.schuele@metaways.de>
Date: Thu, 17 Mar 2016 10:39:00 +0000 (+0100)
Subject: Merge branch '2015.11-develop'
X-Git-Tag: 2016.03.1~6
X-Git-Url: http://git.tine20.org/?p=tine20;a=commitdiff_plain;h=8caf24aa760d08e266ed195dcf0ef30a9f0b6520

Merge branch '2015.11-develop'
---

8caf24aa760d08e266ed195dcf0ef30a9f0b6520