Merge branch '2014.11' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:08 +0000 (10:53 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Jun 2016 08:53:08 +0000 (10:53 +0200)
commit23f3e0de3d814bc3efbced0d7092317345f6f270
tree2cfde774671ab25ac500c2ed1bdfdedae6a31dc1
parentd3e6e67a5611a1059aee0ff2d6144bdfc00e34d4
parent7cafe915024174890491662f63df0fcfe142aaf4
Merge branch '2014.11' into 2015.11

Conflicts:
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Frontend/iMIP.php
tine20/Sales/Setup/Update/Release8.php

Change-Id: I94ce69a37d81e860f8fdef95fe687d3eb26bf735
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tine20/Addressbook/Setup/setup.xml
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Frontend/iMIP.php
tine20/Calendar/Model/Attender.php
tine20/Sales/Setup/Update/Release8.php