Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jul 2015 12:05:30 +0000 (14:05 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 8 Jul 2015 12:05:30 +0000 (14:05 +0200)
commit9673a9d488784dca55d2edfd7bcf48cefcd37226
tree8a932228f58de46d3bf9197a6117c622ea4de1ec
parent662089f4945a01329fbe43d1364fed8fdc5ae5e8
parente4ff122df3f33de5547acd167aa06445ed41ed1d
Merge branch '2014.11-develop' into 2015.07

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

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