* Merge from debian unstable. Remaining changes: + 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. + debian/vsftpd.postinst: Check that group exists first, then the user, then trying adding the user to the group. (LP: #629234) + Add debian/watch file. + debian/patches/09-disable-anonymous.patch: Disable anonymous login by default. (LP: #528860) + Dropped: - debian/patches/11-CVE-2011-0762.patch: No longer needed.