Merge branch 'pu/cal2013'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:46:38 +0000 (15:46 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:46:38 +0000 (15:46 +0100)
commit38267dade0459b9442cf29df9cbb8ebf1eefc071
tree7a298b7c85035f93a6bf840eea790047bfb3ff62
parent23875315402af43040057de5753871a2ab273cd0
parentb3fcef5e7f1efc8e1eac7a71cc84bc454232573a
Merge branch 'pu/cal2013'

Conflicts:
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Calendar/js/Model.js
tine20/Tinebase/Timemachine/ModificationLog.php