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)
commitedde64a993786caace8666934384340e24804e7d
tree84fa22188a54e2ea996a2fa12daf10967f88da8b
parenta1987db4445b66d4b399cd06b91798d90dafa267
parent09491f9b0ea017e6c0598b175cec54a5aeb297f4
Merge branch '2014.11-develop' into 2015.11

Conflicts:
tine20/Tinebase/Container.php

Change-Id: I0c58c2b1653cd247102c793f53125cbaabf5583c
tine20/Calendar/Convert/Event/VCalendar/Factory.php
tine20/Tinebase/Container.php