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)
commit264e1f438e181cd1300152345aa3686eea02bccb
tree827ecbcd5573a155b62327d203a2f53752802dd6
parent3fea194edd4406e6473c0e21dd5db6b472994c64
parent6817300edaa031757d8e3470dd9d4bb67a1d7b81
Merge branch 'pu/2014.11-vcardimport' into 2014.09

Conflicts:
tine20/Addressbook/translations/de.po

Change-Id: I25de85cd726461d3bb82ed86f35a6e393dd283f7
tine20/Addressbook/js/ContactEditDialog.js