Merge branch 'pu/2013.10-icsimport'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Sep 2014 12:42:41 +0000 (14:42 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Sep 2014 12:42:41 +0000 (14:42 +0200)
commita65cb5bd0fecfe6c22b175710e7ce067d952daf7
tree8b064f5fd57a9002bf81606c6c2d635eee8257c6
parent9dac05197e3f8da892cfc790fe962e0b1ef36b6c
parent287aa5ced890fbd4105a0c8d46445c793a4b231e
Merge branch 'pu/2013.10-icsimport'

Conflicts:
tine20/Calendar/Frontend/Json.php
tine20/Calendar/Import/Ical.php
tine20/Calendar/js/ImportDialog.js
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot

Change-Id: I5a152d031d553d992f7c791ee0655bc647edced3
tests/tine20/Calendar/Import/ICalTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot