Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 8 Nov 2013 12:22:01 +0000 (13:22 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 8 Nov 2013 12:22:01 +0000 (13:22 +0100)
1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/RruleTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Felamimail/Controller/Message/Send.php

Simple merge
Simple merge
Simple merge
Simple merge