Merge branch '2013.03' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Apr 2014 08:30:22 +0000 (10:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 8 Apr 2014 08:30:22 +0000 (10:30 +0200)
commitdf1b9235db5eae84f174074edd510d18e21d6827
tree1ddd47d8eaf3a5ca3430c63f97aaa079c5ff030e
parente7c8e2269b7284e8430065aee2fe71f01ac23247
parentaf3f86feccce92cb8961817745f395a7c5941420
Merge branch '2013.03' into 2013.10

Conflicts:
tine20/Tinebase/Record/RecordSet.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Tinebase/Record/RecordSet.php