[proftpd-dfsg] branch master updated (07862e3 -> d3f23b6)

[Francesco Lovergine]

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

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

      from  07862e3   Merge branch 'nodebconf'
       new  d3f23b6   Updated the *right* NEWS file

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 debian/NEWS               | 10 ----------
 debian/changelog          |  2 +-
 debian/proftpd-basic.NEWS | 10 ++++++++++
 3 files changed, 11 insertions(+), 11 deletions(-)

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