Merge branch 'pu/inventory'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Jan 2013 13:23:13 +0000 (14:23 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 14 Jan 2013 13:23:13 +0000 (14:23 +0100)
commit3a5660ef22657bb39c9b2d744d4eab69a0d1e3e6
treee6fa1ab9148b8f69fff0e40d30f41a775cfb15b2
parent535adb8588bda07b9762f45a43b6a0f434ebb77c
parentb51fa593784263be30c34b006f78219dcc9d8f40
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/Frontend/Json/Abstract.php