Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 May 2015 15:52:55 +0000 (17:52 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 May 2015 15:52:55 +0000 (17:52 +0200)
commite95592da3a3dd84cac85e3c22304b423f22926c1
tree8b561373bf2003883d1c2af158f7209cef5c7899
parent5f0393472222e8338b2b502ca152bcd18a7f43d9
parent8d32e521b74de7188b7040b322243fde0103a946
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/Convert/Event/VCalendar/Abstract.php

Change-Id: I985ea58a6fd36d49ec5a7da3b14458bab4a95d50
tests/tine20/Calendar/Controller/EventTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php