* Merge from debian unstable, remaining changes: - 99-ubuntu-ssl-cert-snakeoil: + src/cf.data.pre: * Add reference to snakeoil /etc/ssl - debian/control + Add ssl-cert to Depends to bring in snakeoil certificates. + Modify maintainer value to match Debian-Maintainer-Field spec. - debian/squid.rc - Use squid -k to reload the squid confiration. (LP: #204474)