~gandelman-a/ubuntu/precise/facter/merge922788

Viewing all changes in revision 13.

  • Committer: Bazaar Package Importer
  • Author(s): Chuck Short
  • Date: 2011-02-08 00:18:35 UTC
  • mfrom: (1.1.8 upstream) (3.1.7 sid)
  • Revision ID: james.westby@ubuntu.com-20110208001835-wf46k9o0nfic7sh9
Tags: 1.5.8-2ubuntu1
* Merge from debian unstable.  Remaining changes:
  - Dropped ruby-pkg-tools and libsetup-ruby1.8, we dont want ruby-pkg-tools
    in main. (LP: #408402)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: