-
Committer:
Bazaar Package Importer
-
Author(s):
Michael Vogt
-
Date:
2006-11-22 16:37:57 UTC
-
mfrom:
(0.1.7 upstream)
(1.1.2 etch)
-
Revision ID:
james.westby@ubuntu.com-20061122163757-rbvo3fy0fyofj1ln
Tags: 2.0.0-1ubuntu1
* Merge from debian unstable.
* Remaining changes:
- debian/patches/14_set_http_proxy_env.patch:
+ set http_proxy environment from gconf
- debian/patches/07_desktop_in_ship.patch:
+ don't display root-terminal menu entry