Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Aug 2013 15:51:10 +0000 (17:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 13 Aug 2013 15:51:10 +0000 (17:51 +0200)
commit246e070cc57fa0ee8c2dd32b8c919cd36b59b3c3
tree17fe0999613bd0e68d85622949041bc4acddcd08
parentfcca80943ad3171923ee2e919936730cadb61e58
parentffc40b2d8c84d0c41fde5e3a374bee92df09251a
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
tine20/Tinebase/ModelConfiguration.php
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/form/RecordPickerComboBox.js
tine20/Tinebase/js/widgets/grid/GridPanel.js