[duplicity/f20: 6/6] Merge remote branch 'origin/f22' into f20

[Robert Scheck]

commit 0b684cf9e9c0768e0742999fab1e8fc4c6851cc4
Merge: 628f5f5 17f2dcd
Author: Robert Scheck <robert at fedoraproject.org>
Date:   Fri Mar 6 23:56:43 2015 +0100

    Merge remote branch 'origin/f22' into f20
    
    Conflicts:
    	duplicity.spec

 duplicity-0.6.25-librsync-1.0.0.patch | 20 ++++++++++++++++++++
 duplicity.spec                        | 14 +++++++++-----
 2 files changed, 29 insertions(+), 5 deletions(-)
---