Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/spamassassin...

Conflicts:
	debian/changelog

diff --cc debian/changelog
index 5f76747,9b63444..df27142
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,8 +1,17 @@@
++<<<<<<< HEAD
 +spamassassin-cn (2:3.4.0-5) stable; urgency=low
 +
 +  * novi kljuc i sa-update zbog problema opisanih na stranici:
 +    https://sysportal.carnet.hr/node/1793
 +
 + -- Ivan Rako <Ivan.Rako@CARNet.hr>  Tue, 18 Dec 2018 20:53:18 +0100
++=======
+ spamassassin-cn (2:3.4.1~cn0) stable; urgency=low
+ 
+   * Prva verzija za stretch
+ 
+  -- Ivan Rako <Ivan.Rako@CARNet.hr>  Sun, 08 Jul 2018 00:12:47 +0200
++>>>>>>> 398d1393b4cd16ac3f5c5dd70295bbdbca78c18d
  
  spamassassin-cn (2:3.4.0-4) stable; urgency=low
  

diff --cc debian/postinst
Simple merge