[proftpd-dfsg] 02/03: Merge tag 'upstream/1.3.5e'

[Francesco Lovergine]

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

frankie pushed a commit to branch master
in repository proftpd-dfsg.

commit 0af9f24a40b610449aed033505142c02551b3d80
Merge: 289e1b5 625802b
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Jul 7 12:06:29 2017 +0200

    Merge tag 'upstream/1.3.5e'
    
    Upstream version 1.3.5e

 NEWS                          |  8 +++++
 RELEASE_NOTES                 |  8 +++++
 contrib/dist/rpm/proftpd.spec |  2 +-
 contrib/mod_sftp/mac.c        | 35 ++++++++++--------
 include/version.h             |  4 +--
 modules/mod_auth.c            | 83 +++++++++++++++++++++++++++++++++----------
 6 files changed, 104 insertions(+), 36 deletions(-)

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