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

[Hilmar Preuße]

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

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

commit 8ab9df8d7b994e0093a304598bd1352b1fb0050c
Merge: 3372c04 a4bda98
Author: Hilmar Preuße <hille42 at web.de>
Date:   Wed Feb 21 11:31:00 2018 +0100

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

 debian/TODO                   | 5 +++++
 debian/changelog              | 2 +-
 debian/templates/modules.conf | 7 +++++++
 3 files changed, 13 insertions(+), 1 deletion(-)


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