Merge branch 'pu/2013.10-groupimport'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:17:17 +0000 (19:17 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:17:17 +0000 (19:17 +0200)
commit3b71ccc6094e3780717525fa11d5a10371e09310
treea049d075554ba3d27ef17334f4137a24b1b1f172
parent2f84233c71a1638b605dea369ea7f87fc5b47c3f
parentcce77505643ddb106cd6aeaaf7fe0b9e6e19d1ea
Merge branch 'pu/2013.10-groupimport'
tests/tine20/Courses/JsonTest.php
tine20/Courses/Controller/Course.php