Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 10:51:23 +0000 (12:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 1 Jul 2013 10:51:23 +0000 (12:51 +0200)
commitac6226bb0af0b8b4d69117e22bfeb26fbe3997b4
tree5b7f3a156bf193a0dc04c42d5022099aa1f88a50
parent273a8d24ba13e44f965ed4e9596e8719156b2e94
parentd0b170a465b7ebad91e7b4a18b552f42f7314909
Merge branch '2013.03'

Conflicts:
tine20/Calendar/translations/es.po
tine20/Calendar/translations/template.pot
tine20/Crm/translations/es.po
tine20/HumanResources/translations/template.pot
tine20/Phone/translations/template.pot
tine20/Sales/translations/template.pot
tine20/Sipgate/translations/template.pot
tine20/Tasks/translations/template.pot
tine20/Timetracker/translations/template.pot
tine20/Tinebase/translations/template.pot
tine20/Voipmanager/translations/template.pot
21 files changed:
tine20/Addressbook/translations/es.po
tine20/Addressbook/translations/ru.po
tine20/Addressbook/translations/template.pot
tine20/Calendar/translations/hr_HR.po
tine20/Calendar/translations/pl.po
tine20/Calendar/translations/ru.po
tine20/Courses/translations/template.pot
tine20/Crm/translations/pl.po
tine20/Crm/translations/template.pot
tine20/Filemanager/translations/ru.po
tine20/Filemanager/translations/template.pot
tine20/HumanResources/translations/pl.po
tine20/Projects/translations/template.pot
tine20/Sales/js/ContractGridPanel.js
tine20/Sales/js/Models.js
tine20/SimpleFAQ/translations/template.pot
tine20/Tinebase/js/AppManager.js
tine20/Tinebase/js/MainMenu.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/ru.po
tine20/Voipmanager/translations/es.po