Merge branch 'pu/2013.10-caldavimport' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:34:51 +0000 (10:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 16 Oct 2014 08:34:51 +0000 (10:34 +0200)
commit0bc6305c1114909f671f17cb8f9f9107339d33d4
tree4eee65829bf557a87bb18d312a618342276bd778
parentece97840b7e9d0fd31ec8250592de031f0365828
parent8187c8f3dd35a742f8f135c9b4e0e4d82dff74cc
Merge branch 'pu/2013.10-caldavimport' into 2014.09

Conflicts:
tests/tine20/TestServer.php
tine20/Calendar/Import/CalDav/Client.php

Change-Id: I5d6b66c9fc4b84ef72c631738e628808aec43e1c
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Calendar/Frontend/WebDAV/Event.php
tine20/Calendar/Import/CalDav/Client.php
tine20/Tinebase/Auth/CredentialCache.php