Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 09:34:12 +0000 (11:34 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 23 Jul 2013 09:34:12 +0000 (11:34 +0200)
commit9da8c60d50200f889872fcc7929adc5052fa945e
tree95f8e0feac2d797aaa0fa6540c8055a5a0924383
parent0b7bc396359789fd5e4bf8f90aa5ce4735427381
parent9bae4ab6b3e9bcf52cea884b24b5f3596d4ba9b1
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tine20/Voipmanager/Setup/DemoData.php
tine20/Admin/Setup/DemoData.php
tine20/Tinebase/Frontend/Cli.php
tine20/Voipmanager/Setup/DemoData.php