Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Nov 2013 15:58:31 +0000 (16:58 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Nov 2013 15:58:31 +0000 (16:58 +0100)
commit8528a3fd5ff23e64da699c1f48aa981c5b811e31
treec6bc9acc5db294419e502a6d6bf30228a495d3d8
parent0cbc5ec5948753f559af64426b55f646d35941b9
parentc6c9d23f2fe514d27b893ca27f6b17310fe71c4f
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Calendar/Controller/EventNotifications.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Felamimail/JsonTest.php
tine20/Calendar/Controller/EventNotifications.php
tine20/Calendar/Model/Event.php
tine20/Felamimail/Controller/Message/Send.php