Merge branch 'pu/2013.10-icsimport'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:20:10 +0000 (19:20 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:20:10 +0000 (19:20 +0200)
commit19d000aa77e40f7757c31bf226296424cc954b30
treee6b3d3c009c018fa91dfd2b1ca390c6169c215b3
parent3b71ccc6094e3780717525fa11d5a10371e09310
parentca5ff3026d93cece0b2c63c0b3bb3e94de866995
Merge branch 'pu/2013.10-icsimport'

Conflicts:
tests/tine20/Calendar/Import/ICalTest.php
tine20/Calendar/Setup/Update/Release8.php

Change-Id: I25865876ee469a59ebb8f4d7bec3386b710cb380
tests/tine20/Calendar/Import/ICalTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Tinebase.jsb2