[proftpd-mod-clamav] 03/05: Merge branch 'upstream'

[Francesco Lovergine]

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

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

commit 30d08ab89eec593af775bd3b6ffbcc400749469b
Merge: 25d8399 5518b87
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Sun Feb 5 18:30:33 2017 +0100

    Merge branch 'upstream'

 mod_clamav.c | 1174 ++++++++++++++++++++++++++++++++--------------------------
 1 file changed, 659 insertions(+), 515 deletions(-)

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