0c1a7fb Merge branch 'master' of ssh://pkgs.fedoraproject.org/deja-dup

Merged and Committed by Kai Engert 10 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/deja-dup
    
    Conflicts:
    	deja-dup.spec
    	sources
    
        
file modified
+2 -0
file modified
+11 -2