Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Jun 2015 12:44:59 +0000 (14:44 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 25 Jun 2015 12:44:59 +0000 (14:44 +0200)
commit83c7d691cbc53dde07e2e2234f5554346270d780
treeeff39fa7d72f9cf6c8485c451d8a5ff1c67d0e16
parent110725df6cc6d208848f3c8dc4d8fb7211e23383
parent74b17e625173a4245886334151ff3e00de761bfb
Merge branch '2013.10' into 2014.11
tests/tine20/HumanResources/JsonTests.php
tine20/Courses/Controller/Course.php