Merge remote-tracking branch 'gerrit/pu/2013.03/modelconfig-hr'
authorCornelius Weiß <mail@corneliusweiss.de>
Wed, 20 Mar 2013 16:51:08 +0000 (17:51 +0100)
committerCornelius Weiß <mail@corneliusweiss.de>
Wed, 20 Mar 2013 16:51:08 +0000 (17:51 +0100)
commitb096747a238f57cf7a7483b61be1351509190e03
treea3e356b2454c7acd1fe65bef89738d6736815f5e
parentd12f94cd22a551ce072d346a1810dea0335e2e96
parent2f6bf627920798cafc5ba1e8bf83e5128f3a15c3
Merge remote-tracking branch 'gerrit/pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Crm/Controller.php
tine20/Addressbook/js/ContactModel.js
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/js/widgets/grid/GridPanel.js