Merge branch '2013.03'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Jul 2013 14:16:59 +0000 (16:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 18 Jul 2013 14:16:59 +0000 (16:16 +0200)
commitc5b20f1ae1b44bef649395e1178e812fe32a4eff
tree6a7e3889a7c0c49e2e71e00e86a3379ac5a0e1ec
parente255f27932d0fe06d8fb5c7b1221bfa5bbc9757c
parentf3238ac58d52676fb13d83c93d5ed0027acfecfa
Merge branch '2013.03'

Conflicts:
tine20/Calendar/translations/es.po
tine20/Calendar/translations/ru.po
tine20/Crm/translations/es.po
tine20/Filemanager/translations/es.po
tine20/HumanResources/translations/es.po
tine20/HumanResources/translations/ru.po
tine20/Sales/translations/es.po
tine20/Sales/translations/ru.po
tine20/SimpleFAQ/translations/es.po
tine20/Sipgate/translations/es.po
tine20/Sipgate/translations/ru.po
tine20/Tasks/translations/es.po
tine20/Tasks/translations/ru.po
tine20/Timetracker/translations/es.po
tine20/Timetracker/translations/ru.po
tine20/Tinebase/translations/es.po
tine20/Tinebase/translations/ru.po
tine20/Voipmanager/translations/es.po
tine20/Voipmanager/translations/ru.po
12 files changed:
tine20/Addressbook/translations/es.po
tine20/Addressbook/translations/ru.po
tine20/Admin/js/Applications.js
tine20/Calendar/Controller/Event.php
tine20/Courses/translations/es.po
tine20/Courses/translations/ru.po
tine20/Crm/translations/ru.po
tine20/Filemanager/translations/ru.po
tine20/Projects/translations/es.po
tine20/Projects/translations/ru.po
tine20/SimpleFAQ/translations/ru.po
tine20/Tinebase/Record/Abstract.php