Branches for Quantal

Author: Andres Rodriguez
Revision Date: 2012-05-23 16:59:36 UTC

* Merge from Debian testing (LP: #1003644). Remaining changes:
  + 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.
  + Add debian/watch file.
  + debian/patches/09-disable-anonymous.patch: Disable anonymous login
    by default. (LP: #528860)
* debian/patches/12-ubuntu-us-snakeoil-ssl.patch: Use snakeoil SSL
  certificates and key.