e71c9c0 Merge branch 'f20' into f19

Merged and Committed by bruno 10 years ago
    Merge branch 'f20' into f19
    
    Conflicts:
    	sources
    	squashfs-tools.spec
    
        
file modified
+5 -0
file modified
+4 -1