53ac9a5 Merge branch 'master' of ssh://pkgs.fedoraproject.org/filezilla

Merged and Committed by kwizart 13 years ago
    Merge branch 'master' of ssh://pkgs.fedoraproject.org/filezilla
    
    Conflicts:
    	.gitignore
    	filezilla.spec
    	sources
    
        
file modified
+1 -0
file modified
+1 -1