Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:31:32 +0000 (16:31 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 5 Jun 2013 14:31:32 +0000 (16:31 +0200)
Conflicts:
tine20/Tinebase/Core.php

1  2 
tests/tine20/Courses/JsonTest.php
tests/tine20/Inventory/Import/CsvTest.php

Simple merge