Merge branch 'pu/2013.10-mutenotification'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:23:30 +0000 (19:23 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:23:30 +0000 (19:23 +0200)
commitfd3ba273cb93a4e4ff457cfb142f29dec87206ca
treee005dc38da59aaed92c757812cf1d03f2750b1a4
parentfda60670f8c0526670bae4f57675015eb78936d2
parent4b8fa760d4b40fe81f6f4979cd8acf7d01b9c703
Merge branch 'pu/2013.10-mutenotification'

Conflicts:
tine20/Calendar/translations/de.po

Change-Id: I56520e8cab4896d20c0e9a98a911cb469a47a0fe
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
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot