Merge branch 'pu/2014.11-vcardimport' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Feb 2015 13:31:11 +0000 (14:31 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 17 Feb 2015 13:31:11 +0000 (14:31 +0100)

Trivial merge