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)
commit23844e3fa8bbfb27a3ff85b6782c3292cb9826e6
treee24f993dfc7df92fde09b3df3338f385631bbb8c
parent6066efdfd231be934e426cbf6922b31f39fb5bad
parentb4a4e60c3382fd07a280601627176bfda9e89600
Merge branch '2013.03'

Conflicts:
tine20/Tinebase/Core.php
tests/tine20/Courses/JsonTest.php
tests/tine20/Inventory/Import/CsvTest.php