Merge branch 'master' of github.com:nikiroo/jvcard
authorNiki Roo <niki@nikiroo.be>
Sun, 13 Mar 2016 13:11:44 +0000 (14:11 +0100)
committerNiki Roo <niki@nikiroo.be>
Sun, 13 Mar 2016 13:11:44 +0000 (14:11 +0100)

Trivial merge