Merge branch '2014.11-develop' into 2015.11 2015.07.6
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Nov 2015 09:29:13 +0000 (10:29 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 19 Nov 2015 09:29:13 +0000 (10:29 +0100)
Conflicts:
tine20/Tinebase/Container.php

Change-Id: I0c58c2b1653cd247102c793f53125cbaabf5583c

1  2 
tine20/Calendar/Convert/Event/VCalendar/Factory.php
tine20/Tinebase/Container.php

Simple merge