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

Simple merge