Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Apr 2015 11:08:17 +0000 (13:08 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 27 Apr 2015 11:08:17 +0000 (13:08 +0200)
commit99783489082f872ab9cd29ef89aa66bd883f72e7
tree392353b675265ddbfbbde9d52b2b604fc1f031dd
parenta8422161fafc4ced5005d33c27d1f7752ce5e293
parent539fda1749ff479acaa640041eb68e6a84d292ae
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/translations/de.po

Change-Id: If03b84f0441adbb7821f0ed10dfc1f416d11993b
tine20/Crm/js/LeadEditDialog.js
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/translations/de.po
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php