Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 Mar 2015 16:54:57 +0000 (17:54 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 2 Mar 2015 16:54:57 +0000 (17:54 +0100)
Conflicts:
tine20/Crm/translations/de.po
tine20/Crm/translations/template.pot
tine20/Sales/translations/de.po
tine20/Sales/translations/template.pot

Change-Id: I3bde228cdb58549963e9b7f95f894784414075b4


Trivial merge