Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:08:25 +0000 (09:08 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 25 Jan 2016 08:08:25 +0000 (09:08 +0100)
commit7a8610198d41d7757d7af7f55169f74998399d9a
tree91528c7f4baca3810b7cb4973c38110188b92eef
parentb56a674fbed1d33b14ded65cb01e26c28c7b6a9f
parent9826f93274424e2332110868cda241e3a1dd9022
Merge branch '2014.11' into 2014.11-develop

Conflicts:
tine20/Calendar/Setup/Update/Release8.php

Change-Id: I6deeb82f286072311b6bf0fd24d3d66dcffd09c4
tine20/Calendar/Setup/Update/Release8.php