[duplicity/f21] (6 commits) ...Merge remote branch 'origin/f22' into f21

[Robert Scheck]

Summary of changes:

  34191c2... Rebuild for librsync 1.0.0 (#1126712) (*)
  f440bd0... Patch out deprecation warning. (*)
  60d26db... Merge branch 'f22' of ssh://pkgs.fedoraproject.org/duplicit (*)
  6e3ec8e... Fix patch command. (*)
  17f2dcd... Fix patching. (*)
  fd8e6d7... Merge remote branch 'origin/f22' into f21

(*) This commit already existed in another branch; no separate mail sent