Merge remote-tracking branch 'gerrit/pu/2013.03/modelconfig-hr'
authorCornelius Weiß <mail@corneliusweiss.de>
Thu, 28 Mar 2013 16:49:28 +0000 (17:49 +0100)
committerCornelius Weiß <mail@corneliusweiss.de>
Thu, 28 Mar 2013 16:49:28 +0000 (17:49 +0100)
commit08420b3177313a98ab96b8d65bdbdbc3beff57c3
treecdc09d344e68824336b26fbdde64706ab4623fe1
parent5ea513d88a670a02d74241028c0e036ec0bd509b
parentda6ab692f56af2d669b4d039a4aaddff4414c727
Merge remote-tracking branch 'gerrit/pu/2013.03/modelconfig-hr'

Conflicts:
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/Tinebase/js/widgets/grid/GridPanel.js