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)
commitce822a7cd8ff95a031e477e37d23c114228cc5b6
tree664db7f9179e36328350d2c3affe0d68457c12f3
parentae21e25c2caf72385445689462012ca0228c721b
parentae22c2473f7203b8713dec1c1de532c312000d1e
Merge branch 'master' of elynx.fr:repo/jvcard