~ubuntu-branches/ubuntu/oneiric/rsync/oneiric

Viewing all changes in revision 27.

  • Committer: Bazaar Package Importer
  • Author(s): Jamie Strandboge
  • Date: 2011-05-05 15:07:18 UTC
  • mfrom: (1.1.11 upstream) (2.1.6 sid)
  • Revision ID: james.westby@ubuntu.com-20110505150718-6bab4rkzgrn51wv3
Tags: 3.0.8-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - debian/patches/delete-delay.diff: correct error message when using
    --delete-delay (LP: #516241), patch originally from Jonas Pedersen
* Drop debian/patches/security-CVE-2011-1097.diff which is now included
  upstream

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: