Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:18 +0000 (13:07 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 13 Jul 2015 11:07:18 +0000 (13:07 +0200)
commit5139b85346cc4a136023b280971180992d08d83f
treed4db084571a0b97cc32f756a893e4ced9929cc1a
parentdf0ba82f93665c1efdb06b90bbd24c503a1fe186
parenta6a1ee827f375d952d60bc901e9b4c8f9dfa8890
Merge branch '2013.10' into 2014.11

Conflicts:
tine20/Calendar/Controller/Event.php

Change-Id: I3a162ebb12ebe5fa544d630f791bf0116a8f72b7
tests/tine20/Calendar/Controller/EventTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Tinebase/WebDav/PrincipalBackend.php