Merge branch '2014.11-develop' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 May 2015 15:58:42 +0000 (17:58 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 May 2015 15:58:42 +0000 (17:58 +0200)
commit61902646042aebe0ea2e5d13c0e9a3ba958349fa
tree62271a98bd47925c1d13f725926e48c23ff75f91
parent6bb977704a9966a6d2a69ca3a231aa3cd7335c3f
parent0e0f7512f1394a40e0a81bdc044bcc73e2282531
Merge branch '2014.11-develop' into 2014.09

Conflicts:
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot

Change-Id: I9aed7064e96bdbf6f6f07cbd00ee580273ee12b1
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Felamimail/js/AccountEditDialog.js