Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Aug 2013 11:43:32 +0000 (13:43 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 15 Aug 2013 11:43:32 +0000 (13:43 +0200)
1  2 
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Notes.php

Simple merge