From: Ivan Rako <ivan.rako@srce.hr>
Date: Fri, 11 Jan 2019 15:41:11 +0000 (+0100)
Subject: Merge branch 'master' of merak.carnet.hr:/srv/paketi/carnet-debian/scm/spamassassin... 
X-Git-Tag: debian/2%3.4.0-6~2
X-Git-Url: http://ftp.carnet.hr/carnet-debian/scm?a=commitdiff_plain;h=b904b9e8d67225dbe7189c41a9852cc6cbee4071;p=spamassassin-cn.git

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

Conflicts:
	debian/changelog
---

b904b9e8d67225dbe7189c41a9852cc6cbee4071
diff --cc debian/changelog
index 5f76747,9b63444..df27142
--- a/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