Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Aug 2013 13:00:55 +0000 (15:00 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 1 Aug 2013 13:00:55 +0000 (15:00 +0200)
commit39f63b6cdb997dda899fa0d8be72695ca81e7415
treec03cd62374b6de9aff8efe6c4357a21889855096
parenta272182fed88d0054b18e7b71b9acd5120587fe7
parent9d71816c7da69f52bb9d4a8cba12779edf8e1f39
Merge branch 'pu/2013.03/modelconfig-hr'
tests/tine20/Sales/JsonTest.php
tests/tine20/TestServer.php
tine20/Tasks/js/TaskGridPanel.js