Merge branch 'master' of elynx.fr:repo/jvcard
authorNiki Roo <roo.niki@gmail.com>
Tue, 1 Mar 2016 12:49:36 +0000 (13:49 +0100)
committerNiki Roo <roo.niki@gmail.com>
Tue, 1 Mar 2016 12:49:36 +0000 (13:49 +0100)

Trivial merge