2ad60fb Merge remote-tracking branch 'origin/f16' into el6

Merged and Committed by richardfearn 9 years ago
1 file changed. 3 lines added. 0 lines removed.
    Merge remote-tracking branch 'origin/f16' into el6
    
    Conflicts:
    	ncdu.spec
    
        
file modified
+3 -0