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)
commita25f19f8f6cfa20d3d9a32443f688ea0dce61e7d
treea07f2e5be12647f20ddeb4b15c777c0d16801fb2
parent4b36a47b89c941f2af5133f4b3bfa97d68fe45ad
parent9b651a8fa6023ec35fec327a3c7813142c47f5f9
Merge branch '2014.11-develop' into 2014.09

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

Change-Id: I3bde228cdb58549963e9b7f95f894784414075b4