[proftpd-dfsg] branch master updated (a4bda98 -> 8ab9df8)

[Hilmar Preuße]

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

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

      from  a4bda98   Notes on bugs for systemd integration.
       new  3372c04   Add patch for upstream_4312.
       new  8ab9df8   Merge branch 'master' of ssh://git.debian.org/git/pkg-proftpd/proftpd-dfsg

The 2 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/changelog                         |   2 +
 debian/patches/series                    |   2 +
 debian/patches/upstream_4312             | 227 +++++++++++++++++++++++++++++++
 debian/patches/upstream_4312_fix_version |  33 +++++
 4 files changed, 264 insertions(+)
 create mode 100644 debian/patches/upstream_4312
 create mode 100644 debian/patches/upstream_4312_fix_version

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