~ubuntu-branches/ubuntu/oneiric/whois/oneiric

Viewing all changes in revision 22.

  • Committer: Bazaar Package Importer
  • Author(s): Angel Abad
  • Date: 2011-02-06 13:10:00 UTC
  • mfrom: (5.4.3 sid)
  • Revision ID: james.westby@ubuntu.com-20110206131000-8s9i9x4i096ptfy3
Tags: 5.0.11ubuntu1
* Merge from debian unstable. (LP: #714033) Remaining changes:
  - Add replaces/conflicts as mkpasswd is no longer a separate package.
    + Note: This needs to be kept until the next LTS release
      as mkpasswd is a published package in lucid.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: