Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 9 Aug 2013 10:27:57 +0000 (12:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 9 Aug 2013 10:27:57 +0000 (12:27 +0200)
commitd41f1da106985d4f6a079f630260fa30c3c0a872
tree8eac20e78fabbef3b430d76a0c7ebfa05c6c8b20
parent637bd3b438f21a04fc881864f45a2cd489dc3a8b
parentae1520a5da384f0ea78b874342274fdbedafce85
Merge branch '2013.03'

Conflicts:
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tests/tine20/Calendar/Import/ICalTest.php
tests/tine20/TestServer.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php