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)
commit1558d581f1c6bb61ef8a338384e553607f39015f
treefcfdad412abfc69371ccb50c0bd789fac7fb2420
parent1e19fcabca3019e7384652508280a01745385e27
parent6817300edaa031757d8e3470dd9d4bb67a1d7b81
Merge branch 'pu/2014.11-vcardimport' into 2014.11-develop