Merge branch 'pu/2013.10-caldav' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:32:05 +0000 (10:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:32:05 +0000 (10:32 +0200)
commitece97840b7e9d0fd31ec8250592de031f0365828
tree5797590cce61fc0739cce9b3338ebb3a15465311
parenta29065d6c73cd105f0ac90875c77494c9a5b0c55
parent80138c441efa2d8691e1fd6b39c0d6d3f4899f75
Merge branch 'pu/2013.10-caldav' into 2014.09

Conflicts:
tests/tine20/Calendar/TestCase.php

Change-Id: I1fcce68db0cb6299d646430488381d061799476e
tests/tine20/Calendar/Frontend/WebDAV/EventTest.php
tests/tine20/Calendar/TestCase.php
tests/tine20/TestCase.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php