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)
commit7e7aacc354e63be29f60f4042ee47dafccbe70d7
tree6a523267d9158244d0716ec46412bad3f938019b
parent1c90b2f853971b3efd630b57f41964aade5a9303
parent6c7f7beee7d8ef66d23d2a3167cc3b5493b700fd
Merge branch '2013.03' into pu/2013.03/modelconfig-hr
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tine20/Calendar/Controller/Event.php
tine20/Phone/Controller.php
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js