60d26db Merge branch 'f22' of ssh://pkgs.fedoraproject.org/duplicity into f22

Merged and Committed by limb 9 years ago
    Merge branch 'f22' of ssh://pkgs.fedoraproject.org/duplicity into f22
    
        
file modified
+8 -2