Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/spamassassin...
authorIvan Rako <ivan.rako@srce.hr>
Fri, 11 Jan 2019 15:41:11 +0000 (16:41 +0100)
committerIvan Rako <ivan.rako@srce.hr>
Fri, 11 Jan 2019 15:41:11 +0000 (16:41 +0100)
commitb904b9e8d67225dbe7189c41a9852cc6cbee4071
tree4bce63849741995cdcd20748c0fe83f91075a238
parent1d812cb8d0340b99ab6a1f8e00f5a7a542609795
parent398d1393b4cd16ac3f5c5dd70295bbdbca78c18d
Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/spamassassin-cn into jessie

Conflicts:
debian/changelog
debian/changelog
debian/postinst