Merge branch '2014.11-develop' into 2015.11
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Jan 2016 14:57:27 +0000 (15:57 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 6 Jan 2016 14:57:27 +0000 (15:57 +0100)
1  2 
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Felamimail/Frontend/ActiveSync.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Frontend/Http.php

Simple merge
Simple merge
Simple merge