Merge branch 'pu/2013.10-mutenotification' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:12:11 +0000 (10:12 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:12:11 +0000 (10:12 +0100)
commit79045f4c2396869bcfc74555909a098c94e622c4
treef8f54a6874f7acc7f400ae17db63df80da18cd2b
parent7110d79ff69f55b1475f383d12a521bc82d70e21
parent4b8fa760d4b40fe81f6f4979cd8acf7d01b9c703
Merge branch 'pu/2013.10-mutenotification' into 2013.10

Conflicts:
tests/tine20/Calendar/Frontend/iMIPTest.php

Change-Id: I8352806b92bd3d75cac3fafeced6f4b765a8803b
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Event.php
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/Model.js