Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 14 Aug 2015 10:19:58 +0000 (12:19 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 14 Aug 2015 10:19:58 +0000 (12:19 +0200)
commite1691f1fee184e14a6853d491d5867519c5d476c
treee4ee8cf4ae0fb04e2c8d82cabbf20a8fbd4a92ed
parent38ae8384fefe6a1f58e7a95a072054136c5a159a
parentf856e006694150b02af8811d0a2c83154346184e
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Tinebase/Container.php

Change-Id: I80523a8bc93b470236a046103cd9527cbaa0418b
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/Container.php