Merge branch 'pu/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:41:25 +0000 (15:41 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 21 Feb 2013 14:41:25 +0000 (15:41 +0100)
commit23875315402af43040057de5753871a2ab273cd0
treef6ba70094a66d1d3ed90455e80a4d25a8a095ccf
parente0dd847f758919109ebf5f62c49f2d0dc515479a
parent483f3c9024c0a9d972718930f7c12133e7946a34
Merge branch 'pu/inventory'

Conflicts:
tine20/Inventory/Setup/Update/Release6.php
tine20/Inventory/Setup/setup.xml
tine20/Inventory/Setup/setup.xml
tine20/Tinebase/Import/Abstract.php