-
Committer:
Package Import Robot
-
Author(s):
Mikhail Turov
-
Date:
2010-08-06 01:34:59 UTC
-
mfrom:
(5.1.6 sid)
-
Revision ID:
package-import@ubuntu.com-20100806013459-f19dml7gn12q5bnj
Tags: 1:1.2-2ubuntu1
* Merge from Debian (LP: #612862). Remaining changes:
  + debian/patches/disable-avahi-browse.diff:
    Disable avahi-browse since it scales poorly in the current
    form. (LP: #510591)
* Dropped patches (fixed upstream)
  - debian/patches/support_multiple_hosts_files.diff:
    Fix external ssh known_hosts files (LP: #483499)
  - debian/patches/bash-completion-wget-o-fix:
    Fix directory escaping for wget -O (LP: #435055)