Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Jun 2013 08:30:41 +0000 (10:30 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 7 Jun 2013 08:30:41 +0000 (10:30 +0200)
1  2 
tests/tine20/Calendar/JsonTests.php
tests/tine20/Courses/JsonTest.php
tine20/Calendar/js/MainScreenCenterPanel.js

Simple merge
Simple merge