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)
1  2 
tests/tine20/Courses/JsonTest.php
tine20/Courses/Controller/Course.php

Simple merge
Simple merge