Merge branch 'pu/2014.11-vcardimport' into 2014.09
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Feb 2015 13:51:17 +0000 (14:51 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 9 Feb 2015 13:51:17 +0000 (14:51 +0100)
Conflicts:
tine20/Addressbook/translations/de.po

Change-Id: I25de85cd726461d3bb82ed86f35a6e393dd283f7

1  2 
tine20/Addressbook/js/ContactEditDialog.js