Merge branch 'pu/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Jan 2013 11:02:56 +0000 (12:02 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 17 Jan 2013 11:02:56 +0000 (12:02 +0100)
commit92c60e4dba167380539f1a8e03410c5411111110
tree326dba1e0ba75bb9835230aab1dd255ec409b820
parent26a6d21c28147430b338fb9816d3379cc03f1904
parente727777ef2d005741747d4eaf9927568871941dc
Merge branch 'pu/inventory'

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