Merge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Jun 2013 11:12:39 +0000 (13:12 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 3 Jun 2013 11:12:39 +0000 (13:12 +0200)
commit6cb1163ae2b8fca2146afeeaa1a1f43a1cadfc0b
tree53272a16c6ad11146d3b30eaac802aef7ad1b8ca
parent3bebf457f93e56a327a920ccb5fc68b5ea109043
parent43d082ae2e74fad1fc2c648a93f4ef932b4a8290
Merge branch 'pu/2013.03/modelconfig-hr' into pu/2013.03-modelconfig-hr/inventory
tests/tine20/Inventory/Import/CsvTest.php
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/Import/Abstract.php