diff options
| author | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
|---|---|---|
| committer | Julien Valroff <julien@kirya.net> | 2011-04-16 16:47:41 +0200 |
| commit | d43e203266b3d61dac1499351ec20dc57c1728b2 (patch) | |
| tree | d0ed723b249d1ccb0df2c8b1ea0009d1e7390116 /debian/patches/102_clamav-milter.diff | |
| parent | 1d2747f5ec6d056b394335caf5e53598635fbec1 (diff) | |
| parent | 7dd4f231f394157a6ebd1504808e86dc335f6841 (diff) | |
Merge branch 'master' into squeeze-backportsdebian/1.14-9_bpo60+1
Conflicts:
debian/changelog
Diffstat (limited to 'debian/patches/102_clamav-milter.diff')
| -rw-r--r-- | debian/patches/102_clamav-milter.diff | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/debian/patches/102_clamav-milter.diff b/debian/patches/102_clamav-milter.diff index c9eac04..a8378fe 100644 --- a/debian/patches/102_clamav-milter.diff +++ b/debian/patches/102_clamav-milter.diff @@ -4,7 +4,7 @@ Forwarded: no --- a/mailgraph.pl +++ b/mailgraph.pl -@@ -820,6 +820,9 @@ +@@ -847,6 +847,9 @@ if($text =~ /Intercepted/) { event($time, 'virus'); } |