Merge branch 'master' of elynx.fr:repo/jvcard