-
Committer:
Bazaar Package Importer
-
Author(s):
Chuck Short
-
Date:
2008-05-26 13:20:14 UTC
-
mfrom:
(1.1.13 upstream)
-
Revision ID:
james.westby@ubuntu.com-20080526132014-dnmt59mfsoivie98
Tags: 2.6.20-1ubuntu1
* Merge from debian unstable, remaining changes:
- 99-ubuntu-ssl-cert-snakeoil:
+ src/cf.data.pre:
* Add reference to snakeoil in /etc/ssl
- debian/control
+ Add ssl-cert to Depends to bring in snakeoil certificates.
* Moifiy maintainer value to match Debian-Maintainer-Field Spec.
* debian/squid.rc
- Used squid -k to reload the squid configuration. (LP: #204474)