Merge branch 'pu/2013.10-caldav' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 22 Sep 2014 09:27:47 +0000 (11:27 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 22 Sep 2014 09:27:47 +0000 (11:27 +0200)
1  2 
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/TestCase.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Attender.php

Simple merge
Simple merge
Simple merge