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)
Conflicts:
tine20/Calendar/translations/de.po
tine20/Calendar/translations/template.pot

Change-Id: I9aed7064e96bdbf6f6f07cbd00ee580273ee12b1

1  2 
tine20/Calendar/Convert/Event/VCalendar/Abstract.php
tine20/Felamimail/js/AccountEditDialog.js