~ubuntu-branches/ubuntu/natty/jockey/natty

Viewing all changes in revision 117.

  • Committer: Bazaar Package Importer
  • Author(s): Martin Pitt
  • Date: 2011-03-11 18:07:01 UTC
  • Revision ID: james.westby@ubuntu.com-20110311180701-7vc1beofdphdu28y
Tags: 0.9.2-0ubuntu3
* Merge from trunk:
  - OSLib.import_gpg_key(): Respect $http_proxy. Thanks Olaf Meeuwissen.
    (LP: #733023)
  - oslib.py: Switch to default keyserver on port 80 to be more proxy
    friendly. (LP: #733029)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: