[proftpd-dfsg] 04/05: Merge branch 'master' of ssh://git.debian.org/git/pkg-proftpd/proftpd-dfsg

[Francesco Lovergine]

This is an automated email from the git hooks/post-receive script.

frankie pushed a commit to tag debian/1.3.5b-1
in repository proftpd-dfsg.

commit 017d29efabea888d70bc99258e3c3f7d79a7d992
Merge: 2ba8b54 4f75f92
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sun Dec 11 14:40:46 2016 +0100

    Merge branch 'master' of ssh://git.debian.org/git/pkg-proftpd/proftpd-dfsg

 debian/changelog | 1 +
 1 file changed, 1 insertion(+)

diff --cc debian/changelog
index f36e1c6,2dbd84e..4793d36
--- a/debian/changelog
+++ b/debian/changelog
@@@ -47,10 -47,9 +47,11 @@@ proftpd-dfsg (1.3.5b-1) unstable; urgen
  
    [ Francesco Paolo Lovergine ]
    * New upstream release. Merged patch for #809068.
+     Contains fix for CVE-2016-3125 (Closes: #818492)
    * Patchset updated and uniformed for name.
    * ABI version updated.
 +  * Debhelper compatibility set to 9.
 +  * Policy bumped to 3.9.8, no changes required.
  
   -- Francesco Paolo Lovergine <frankie at debian.org>  Sat, 10 Dec 2016 20:49:59 +0100
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-proftpd/proftpd-dfsg.git