-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2010-07-12 08:57:17 UTC
-
mfrom:
(2.3.11 sid)
-
Revision ID:
james.westby@ubuntu.com-20100712085717-hf7k37o9swf8geku
Tags: 2.3.0~pre2-4ubuntu1
* Merge from debian unstable:
- Use snakeoil SSL certificates and key.
- debian/rules, debian/vsftpd.upstart: migrate vsftpd to upstart
- Add apport hook: (LP: #513978):
- debian/vsftpd.apport: Added.
- debian/control: Build-depends on dh-apport.
- debian/rules: Add --with apport.