Merge branch 'pu/2013.10-msoffice'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:22:59 +0000 (19:22 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:22:59 +0000 (19:22 +0200)
commitfda60670f8c0526670bae4f57675015eb78936d2
treeb40b8584d10fb843c9402f214ef4ef18c69d76f5
parent19d000aa77e40f7757c31bf226296424cc954b30
parentc109300c593b997fa37c19ff82fa1b19724a5d70
Merge branch 'pu/2013.10-msoffice'

Conflicts:
tine20/Addressbook/translations/de.po
tine20/Addressbook/translations/template.pot
tine20/Tinebase/translations/de.po
tine20/composer.lock

Change-Id: I5974a772c321a19bb2949cbc7ebc90b447dce0ca
tine20/Addressbook/js/ContactGrid.js
tine20/Addressbook/translations/de.po
tine20/Addressbook/translations/template.pot
tine20/Tinebase/Model/ImportExportDefinition.php
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/composer.json
tine20/composer.lock