~yofel/ubuntu/quantal/btrfs-tools/merge-894456

Viewing all changes in revision 30.

  • Committer: Dmitrijs Ledkovs
  • Date: 2012-05-21 10:34:55 UTC
  • mfrom: (2.1.21 sid)
  • Revision ID: dmitrijs.ledkovs@canonical.com-20120521103455-vgc21w70nnjwbant
Merge with resolve --take-other everything from debian

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: