Merge branch '2013.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Dec 2013 11:01:20 +0000 (12:01 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 6 Dec 2013 11:01:20 +0000 (12:01 +0100)
commit4e9d0d3ed84a65574d776a750aedcd8dedbbbf5b
tree030c2e29a9d4ed19eed15658f2d923e19c03cb7b
parent65fe3f9eaaacdbaf791275ea47c7df0d92fd9c79
parent03eb3724090a162ffc11dafccea865f7d03cdf69
Merge branch '2013.10'

Conflicts:
tests/tine20/Calendar/TestCase.php
tests/tine20/Calendar/TestCase.php
tests/tine20/Courses/JsonTest.php