Merge branch '2013.03' into pu/2013.03/modelconfig-hr
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Aug 2013 15:21:28 +0000 (17:21 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Aug 2013 15:21:28 +0000 (17:21 +0200)
1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/Event.php
tine20/Phone/Controller.php
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js

Simple merge
Simple merge