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)
commit2d18dca59c175729f284537fce32bfa3fc271f05
tree7a298b7c85035f93a6bf840eea790047bfb3ff62
parent93c1307fe7689bdbbc2170f6d1cab1cf166ef3b6
parent93826e0b2b8a00827a2e944a1762d742faa3f457
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