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)
commita81f6aff27f9df63ab183b2acc69bf92ccc3fb3e
tree4b30caaea2f7d2819f76679057877123940596d8
parentd14689d87360b933b19416b1f008ee65d02b10ad
parent3b5202514849fa164e40a606dca58a0c195c550a
Merge branch '2013.03'
tests/tine20/Calendar/JsonTests.php
tests/tine20/Courses/JsonTest.php
tine20/Calendar/js/MainScreenCenterPanel.js