Merge branch 'master' of git://git.dolda2000.com/doldaconnect
authorFredrik Tolf <fredrik@dolda2000.com>
Fri, 6 Oct 2017 20:12:16 +0000 (22:12 +0200)
committerFredrik Tolf <fredrik@dolda2000.com>
Fri, 6 Oct 2017 20:12:16 +0000 (22:12 +0200)
commit88a8d885a8daee56b19365966e6c495c3b913117
treec409665122b1497b66c3851dfee157fd2d2e91bb
parentef0869333c2908986a501759445136bcdf57ceec
parent44a3601c187ff9fc2a6c70e2c1d72c8e31a3c930
Merge branch 'master' of git://git.dolda2000.com/doldaconnect