-
Committer:
Bazaar Package Importer
-
Author(s):
أحمد المحمودي (Ahmed El-Mahmoudy)
-
Date:
2010-12-17 22:38:11 UTC
-
mfrom:
(2.1.7 sid)
-
Revision ID:
james.westby@ubuntu.com-20101217223811-59c3iqaxeekkvomz
Tags: 0.8.15-2ubuntu1
* Merge from Debian unstable (LP: #691448), remaining changes:
- debian/patches/03firsttimer_text:
+ Adapt it so it tells you about connecting to irc.ubuntu.com and
joining #ubuntu instead of irc.debian.org and #debian.
- debian/patches/90irc-ubuntu-com
- debian/patches/91_disable_sslv2.patch: do not use SSLv2 protocol.
This can be dropped in 0.8.16.
- debian/patches/91_ssl_proxy.patch: when we have a proxy setting,
we expect the CN to match the proxy hostname, not the server hostname.